diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f5db83ba..665d9b16f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,300 +1,506 @@
-src/bin/e_about.c
-src/bin/e_actions.c
-src/bin/e_alert.c
-src/bin/e_atoms.c
-src/bin/e_bg.c
-src/bin/e_bindings.c
-src/bin/e_client.c
-src/bin/e_color.c
-src/bin/e_color_dialog.c
-src/bin/e_comp.c
-src/bin/e_comp_x.c
-src/bin/e_config.c
-src/bin/e_config_dialog.c
-src/bin/e_configure.c
-src/bin/e_confirm_dialog.c
-src/bin/e_datastore.c
-src/bin/e_desk.c
-src/bin/e_desklock.c
-src/bin/e_desktop_editor.c
-src/bin/e_dialog.c
-src/bin/e_dnd.c
-src/bin/e_dpms.c
-src/bin/e_entry_dialog.c
-src/bin/e_error.c
-src/bin/e_exec.c
-src/bin/e_exehist.c
-src/bin/e_filereg.c
-src/bin/e_flowlayout.c
-src/bin/e_fm.c
-src/bin/e_fm_custom.c
-src/bin/e_fm_device.c
-src/bin/e_fm_mime.c
-src/bin/e_fm_prop.c
-src/bin/e_focus.c
-src/bin/e_font.c
-src/bin/e_gadcon.c
-src/bin/e_grab_dialog.c
-src/bin/e_grabinput.c
-src/bin/e_hints.c
-src/bin/e_icon.c
-src/bin/e_ilist.c
-src/bin/e_imc_main.c
-src/bin/e_import_config_dialog.c
-src/bin/e_import_dialog.c
-src/bin/e_init.c
-src/bin/e_int_client_locks.c
-src/bin/e_int_client_menu.c
-src/bin/e_int_client_prop.c
-src/bin/e_int_client_remember.c
-src/bin/e_int_config_comp.c
-src/bin/e_int_config_comp_match.c
-src/bin/e_int_config_modules.c
-src/bin/e_int_gadcon_config.c
-src/bin/e_int_menus.c
-src/bin/e_int_shelf_config.c
-src/bin/e_int_toolbar_config.c
-src/bin/e_intl.c
-src/bin/e_ipc.c
-src/bin/e_ipc_codec.c
-src/bin/e_layout.c
-src/bin/e_livethumb.c
-src/bin/e_main.c
-src/bin/e_maximize.c
-src/bin/e_menu.c
-src/bin/e_module.c
-src/bin/e_mouse.c
-src/bin/e_moveresize.c
-src/bin/e_msg.c
-src/bin/e_obj_dialog.c
-src/bin/e_object.c
-src/bin/e_order.c
-src/bin/e_pan.c
-src/bin/e_path.c
-src/bin/e_place.c
-src/bin/e_pointer.c
-src/bin/e_prefix.c
-src/bin/e_remember.c
-src/bin/e_resist.c
-src/bin/e_screensaver.c
-src/bin/e_scrollframe.c
-src/bin/e_sha1.c
-src/bin/e_shelf.c
-src/bin/e_signals.c
-src/bin/e_slider.c
-src/bin/e_spectrum.c
-src/bin/e_start_main.c
-src/bin/e_startup.c
-src/bin/e_sys.c
-src/bin/e_sys_main.c
-src/bin/e_test.c
-src/bin/e_theme.c
-src/bin/e_theme_about.c
-src/bin/e_thumb.c
-src/bin/e_thumb_main.c
-src/bin/e_toolbar.c
-src/bin/e_update.c
-src/bin/e_user.c
-src/bin/e_utils.c
-src/bin/e_widget.c
-src/bin/e_widget_aspect.c
-src/bin/e_widget_bgpreview.c
-src/bin/e_widget_button.c
-src/bin/e_widget_check.c
-src/bin/e_widget_color_well.c
-src/bin/e_widget_config_list.c
-src/bin/e_widget_entry.c
-src/bin/e_widget_filepreview.c
-src/bin/e_widget_font_preview.c
-src/bin/e_widget_framelist.c
-src/bin/e_widget_frametable.c
-src/bin/e_widget_fsel.c
-src/bin/e_widget_ilist.c
-src/bin/e_widget_image.c
-src/bin/e_widget_label.c
-src/bin/e_widget_list.c
-src/bin/e_widget_preview.c
-src/bin/e_widget_radio.c
-src/bin/e_widget_scrollframe.c
-src/bin/e_widget_slider.c
-src/bin/e_widget_spectrum.c
-src/bin/e_widget_table.c
-src/bin/e_widget_textblock.c
-src/bin/e_win.c
-src/bin/e_xinerama.c
-src/bin/e_xkb.c
-src/bin/e_zone.c
-src/modules/appmenu/e_mod_main.c
-src/modules/backlight/e_mod_main.c
-src/modules/battery/e_mod_config.c
-src/modules/battery/e_mod_main.c
-src/modules/bluez5/bz_agent.c
+src/tests/init_states.c
+src/tests/override_fullscreen.c
+src/tests/focusgrab.c
+src/tests/modal.c
+src/tests/urgent.c
+src/tests/activate.c
+src/tests/fullscreen.c
+src/tests/shaped_input.c
+src/modules/conf_paths/e_int_config_paths.c
+src/modules/conf_paths/e_int_config_env.c
+src/modules/conf_paths/e_mod_main.c
+src/modules/fileman_opinfo/e_mod_main.c
 src/modules/bluez5/e_mod_agent.c
-src/modules/bluez5/e_mod_main.c
+src/modules/bluez5/bz_obj.c
 src/modules/bluez5/e_mod_popup.c
 src/modules/bluez5/e_mod_util.c
-src/modules/clock/e_mod_config.c
-src/modules/clock/e_mod_main.c
-src/modules/conf/e_conf.c
-src/modules/conf/e_mod_config.c
-src/modules/conf/e_mod_main.c
-src/modules/conf_applications/e_int_config_apps.c
-src/modules/conf_applications/e_int_config_apps_personal.c
-src/modules/conf_applications/e_int_config_defapps.c
-src/modules/conf_applications/e_int_config_deskenv.c
-src/modules/conf_applications/e_mod_main.c
-src/modules/conf_bindings/e_int_config_acpibindings.c
-src/modules/conf_bindings/e_int_config_edgebindings.c
-src/modules/conf_bindings/e_int_config_keybindings.c
-src/modules/conf_bindings/e_int_config_mousebindings.c
-src/modules/conf_bindings/e_int_config_signalbindings.c
-src/modules/conf_bindings/e_mod_main.c
-src/modules/conf_dialogs/e_int_config_dialogs.c
-src/modules/conf_dialogs/e_int_config_profiles.c
-src/modules/conf_dialogs/e_mod_main.c
-src/modules/conf_display/e_int_config_desk.c
-src/modules/conf_display/e_int_config_desklock.c
-src/modules/conf_display/e_int_config_desklock_fsel.c
-src/modules/conf_display/e_int_config_desks.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_interaction/e_int_config_interaction.c
-src/modules/conf_interaction/e_int_config_mouse.c
-src/modules/conf_interaction/e_mod_main.c
-src/modules/conf_intl/e_int_config_imc.c
-src/modules/conf_intl/e_int_config_imc_import.c
-src/modules/conf_intl/e_int_config_intl.c
-src/modules/conf_intl/e_mod_main.c
-src/modules/conf_menus/e_int_config_menus.c
-src/modules/conf_menus/e_mod_main.c
-src/modules/conf_paths/e_int_config_env.c
-src/modules/conf_paths/e_int_config_paths.c
-src/modules/conf_paths/e_mod_main.c
-src/modules/conf_performance/e_int_config_performance.c
-src/modules/conf_performance/e_int_config_powermanagement.c
-src/modules/conf_performance/e_mod_main.c
-src/modules/conf_randr/e_int_config_randr2.c
-src/modules/conf_randr/e_mod_main.c
-src/modules/conf_shelves/e_int_config_shelf.c
-src/modules/conf_shelves/e_mod_main.c
-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_scale.c
-src/modules/conf_theme/e_int_config_theme.c
-src/modules/conf_theme/e_int_config_theme_import.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_xsettings.c
-src/modules/conf_theme/e_mod_main.c
-src/modules/conf_window_manipulation/e_int_config_clientlist.c
-src/modules/conf_window_manipulation/e_int_config_focus.c
-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_manipulation/e_int_config_window_process.c
-src/modules/conf_window_manipulation/e_mod_main.c
-src/modules/conf_window_remembers/e_int_config_remembers.c
-src/modules/conf_window_remembers/e_mod_main.c
-src/modules/connman/agent.c
-src/modules/connman/e_mod_config.c
-src/modules/connman/e_mod_main.c
-src/modules/cpufreq/e_mod_config.c
-src/modules/cpufreq/e_mod_main.c
-src/modules/everything/e_mod_main.c
-src/modules/everything/evry.c
-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_util.c
-src/modules/everything/evry_view.c
-src/modules/everything/evry_view_help.c
-src/modules/everything/evry_view_tabs.c
-src/modules/fileman/e_fwin.c
-src/modules/fileman/e_fwin_nav.c
-src/modules/fileman/e_int_config_mime.c
-src/modules/fileman/e_int_config_mime_edit.c
-src/modules/fileman/e_mod_config.c
-src/modules/fileman/e_mod_dbus.c
-src/modules/fileman/e_mod_main.c
-src/modules/fileman/e_mod_menu.c
-src/modules/fileman_opinfo/e_mod_main.c
+src/modules/bluez5/bz.c
+src/modules/bluez5/e_mod_main.c
+src/modules/bluez5/bz_agent.c
 src/modules/gadman/e_mod_config.c
 src/modules/gadman/e_mod_gadman.c
 src/modules/gadman/e_mod_main.c
+src/modules/layout/e_mod_main.c
 src/modules/ibar/e_mod_config.c
 src/modules/ibar/e_mod_main.c
+src/modules/backlight/e_mod_main.c
+src/modules/backlight/gadget/mod.c
+src/modules/backlight/gadget/backlight.c
+src/modules/conf_performance/e_int_config_performance.c
+src/modules/conf_performance/e_int_config_powermanagement.c
+src/modules/conf_performance/e_mod_main.c
+src/modules/conf_shelves/e_mod_main.c
+src/modules/conf_shelves/e_int_config_shelf.c
+src/modules/wl_text_input/e_mod_main.c
+src/modules/conf_theme/e_int_config_fonts.c
+src/modules/conf_theme/e_int_config_theme.c
+src/modules/conf_theme/e_int_config_borders.c
+src/modules/conf_theme/e_mod_main.c
+src/modules/conf_theme/e_int_config_scale.c
+src/modules/conf_theme/e_int_config_theme_import.c
+src/modules/conf_theme/e_int_config_color_classes.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_xsettings.c
+src/modules/conf_randr/e_int_config_randr2.c
+src/modules/conf_randr/e_mod_main.c
+src/modules/conf_display/e_int_config_desk.c
+src/modules/conf_display/e_int_config_screensaver.c
+src/modules/conf_display/e_mod_main.c
+src/modules/conf_display/e_int_config_desks.c
+src/modules/conf_display/e_int_config_desklock.c
+src/modules/conf_display/e_int_config_desklock_fsel.c
+src/modules/conf_display/e_int_config_dpms.c
+src/modules/sysinfo/cpuclock/cpuclock.c
+src/modules/sysinfo/cpuclock/cpuclock_config.c
+src/modules/sysinfo/thermal/thermal_udev.c
+src/modules/sysinfo/thermal/thermal_config.c
+src/modules/sysinfo/thermal/thermal.c
+src/modules/sysinfo/thermal/thermal_fallback.c
+src/modules/sysinfo/thermal/thermal_sysctl.c
+src/modules/sysinfo/mod.c
+src/modules/sysinfo/memusage/memusage.c
+src/modules/sysinfo/memusage/memusage_proc.c
+src/modules/sysinfo/memusage/memusage_config.c
+src/modules/sysinfo/memusage/memusage_sysctl.c
+src/modules/sysinfo/cpumonitor/cpumonitor_config.c
+src/modules/sysinfo/cpumonitor/cpumonitor_sysctl.c
+src/modules/sysinfo/cpumonitor/cpumonitor.c
+src/modules/sysinfo/cpumonitor/cpumonitor_proc.c
+src/modules/sysinfo/batman/batman_udev.c
+src/modules/sysinfo/batman/batman_sysctl.c
+src/modules/sysinfo/batman/batman.c
+src/modules/sysinfo/batman/batman_upower.c
+src/modules/sysinfo/batman/batman_fallback.c
+src/modules/sysinfo/batman/batman_config.c
+src/modules/sysinfo/netstatus/netstatus_proc.c
+src/modules/sysinfo/netstatus/netstatus.c
+src/modules/sysinfo/netstatus/netstatus_sysctl.c
+src/modules/sysinfo/netstatus/netstatus_config.c
+src/modules/sysinfo/sysinfo.c
+src/modules/winlist/e_mod_main.c
+src/modules/winlist/e_int_config_winlist.c
+src/modules/winlist/e_winlist.c
+src/modules/wl_buffer/e_mod_main.c
+src/modules/xkbswitch/e_mod_config.c
+src/modules/xkbswitch/e_mod_main.c
+src/modules/xkbswitch/gadget/mod.c
+src/modules/xkbswitch/gadget/xkbswitch.c
+src/modules/xkbswitch/e_mod_parse.c
+src/modules/xwayland/e_mod_main.c
+src/modules/xwayland/dnd.c
+src/modules/clock/e_mod_config.c
+src/modules/clock/e_mod_main.c
+src/modules/conf_dialogs/e_int_config_dialogs.c
+src/modules/conf_dialogs/e_int_config_profiles.c
+src/modules/conf_dialogs/e_mod_main.c
+src/modules/wl_wl/e_mod_main.c
+src/modules/wl_weekeyboard/e_mod_main.c
+src/modules/wl_weekeyboard/wkb-log.c
+src/modules/wireless/wireless.c
+src/modules/wireless/mod.c
+src/modules/wireless/connman.c
+src/modules/systray/e_mod_main.c
+src/modules/systray/e_mod_notifier_watcher.c
+src/modules/systray/e_mod_notifier_host.c
+src/modules/systray/e_mod_notifier_host_dbus.c
+src/modules/temperature/e_mod_config.c
+src/modules/temperature/e_mod_udev.c
+src/modules/temperature/e_mod_main.c
+src/modules/temperature/e_mod_tempget.c
+src/modules/tiling/e_mod_config.c
+src/modules/tiling/window_tree.c
+src/modules/tiling/e_mod_tiling.c
 src/modules/ibox/e_mod_config.c
 src/modules/ibox/e_mod_main.c
-src/modules/lokker/e_mod_main.c
-src/modules/lokker/lokker.c
-src/modules/mixer/e_mod_main.c
-src/modules/mixer/e_mod_config.c
-src/modules/music-control/e_mod_main.c
-src/modules/music-control/ui.c
-src/modules/notification/e_mod_config.c
-src/modules/notification/e_mod_main.c
+src/modules/msgbus/msgbus_module.c
+src/modules/msgbus/e_mod_main.c
+src/modules/msgbus/msgbus_profile.c
+src/modules/msgbus/msgbus_audit.c
+src/modules/msgbus/msgbus_desktop.c
+src/modules/msgbus/msgbus_window.c
+src/modules/msgbus/msgbus_lang.c
+src/modules/wl_drm/e_mod_main.c
+src/modules/conf_window_manipulation/e_int_config_window_display.c
+src/modules/conf_window_manipulation/e_int_config_window_process.c
+src/modules/conf_window_manipulation/e_mod_main.c
+src/modules/conf_window_manipulation/e_int_config_clientlist.c
+src/modules/conf_window_manipulation/e_int_config_focus.c
+src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+src/modules/conf_bindings/e_mod_main.c
+src/modules/conf_bindings/e_int_config_acpibindings.c
+src/modules/conf_bindings/e_int_config_edgebindings.c
+src/modules/conf_bindings/e_int_config_mousebindings.c
+src/modules/conf_bindings/e_int_config_signalbindings.c
+src/modules/conf_bindings/e_int_config_keybindings.c
+src/modules/conf_window_remembers/e_mod_main.c
+src/modules/conf_window_remembers/e_int_config_remembers.c
+src/modules/wl_desktop_shell/xdg.c
+src/modules/wl_desktop_shell/xdg6.c
+src/modules/wl_desktop_shell/xdg5.c
+src/modules/wl_desktop_shell/e_mod_main.c
+src/modules/wl_desktop_shell/wl_shell.c
+src/modules/wl_desktop_shell/e_mod_input_panel.c
+src/modules/shot/e_mod_share.c
+src/modules/shot/e_mod_edit.c
+src/modules/shot/upload.c
+src/modules/shot/e_mod_main.c
+src/modules/shot/e_mod_preview.c
+src/modules/shot/e_mod_delay.c
+src/modules/shot/e_mod_save.c
+src/modules/time/config.c
+src/modules/time/time.c
+src/modules/time/mod.c
+src/modules/time/clock.c
 src/modules/packagekit/e_mod_config.c
 src/modules/packagekit/e_mod_main.c
 src/modules/packagekit/e_mod_packagekit.c
-src/modules/pager/e_mod_config.c
-src/modules/pager/e_mod_main.c
-src/modules/quickaccess/e_mod_config.c
-src/modules/quickaccess/e_mod_main.c
-src/modules/quickaccess/e_mod_quickaccess.c
-src/modules/shot/e_mod_main.c
-src/modules/start/e_mod_main.c
-src/modules/syscon/e_int_config_syscon.c
-src/modules/syscon/e_mod_main.c
-src/modules/syscon/e_syscon.c
-src/modules/syscon/e_syscon_gadget.c
-src/modules/systray/e_mod_main.c
-src/modules/tasks/e_mod_config.c
-src/modules/tasks/e_mod_main.c
-src/modules/teamwork/e_mod_config.c
-src/modules/teamwork/e_mod_main.c
-src/modules/temperature/e_mod_config.c
-src/modules/temperature/e_mod_main.c
-src/modules/tiling/e_mod_config.c
-src/modules/tiling/e_mod_tiling.c
-src/modules/tiling/e_mod_tiling.h
-src/modules/winlist/e_int_config_winlist.c
-src/modules/winlist/e_mod_main.c
-src/modules/winlist/e_winlist.c
-src/modules/wizard/e_mod_main.c
-src/modules/wizard/e_wizard.c
-src/modules/wizard/page_000.c
-src/modules/wizard/page_010.c
+src/modules/appmenu/e_mod_appmenu_render.c
+src/modules/appmenu/e_mod_dbus_registrar_server.c
+src/modules/appmenu/e_mod_main.c
+src/modules/fileman/e_mod_config.c
+src/modules/fileman/e_int_config_mime.c
+src/modules/fileman/e_mod_menu.c
+src/modules/fileman/e_mod_main.c
+src/modules/fileman/e_fwin_nav.c
+src/modules/fileman/e_int_config_mime_edit.c
+src/modules/fileman/e_fwin.c
+src/modules/fileman/e_mod_dbus.c
+src/modules/conf_menus/e_int_config_menus.c
+src/modules/conf_menus/e_mod_main.c
+src/modules/polkit/e_mod_main.c
+src/modules/polkit/auth_ui.c
+src/modules/polkit/polkit.c
 src/modules/wizard/page_011.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_065.c
-src/modules/wizard/page_070.c
-src/modules/wizard/page_080.c
 src/modules/wizard/page_090.c
-src/modules/wizard/page_100.c
-src/modules/wizard/page_110.c
+src/modules/wizard/page_200.c
+src/modules/wizard/page_030.c
+src/modules/wizard/page_020.c
+src/modules/wizard/page_010.c
+src/modules/wizard/page_050.c
+src/modules/wizard/e_wizard.c
 src/modules/wizard/page_120.c
-src/modules/wizard/page_130.c
+src/modules/wizard/page_080.c
+src/modules/wizard/page_065.c
 src/modules/wizard/page_150.c
 src/modules/wizard/page_160.c
-src/modules/wizard/page_170.c
+src/modules/wizard/page_115.c
+src/modules/wizard/e_mod_main.c
+src/modules/wizard/page_000.c
+src/modules/wizard/page_070.c
+src/modules/wizard/page_130.c
 src/modules/wizard/page_180.c
-src/modules/wizard/page_200.c
-src/modules/xkbswitch/e_mod_config.c
-src/modules/xkbswitch/e_mod_main.c
-src/modules/xkbswitch/e_mod_parse.c
+src/modules/wizard/page_170.c
+src/modules/wizard/page_060.c
+src/modules/wizard/page_110.c
+src/modules/wizard/page_100.c
+src/modules/wizard/page_040.c
+src/modules/wl_fb/e_mod_main.c
+src/modules/syscon/e_syscon_gadget.c
+src/modules/syscon/e_mod_main.c
+src/modules/syscon/e_syscon.c
+src/modules/syscon/e_int_config_syscon.c
+src/modules/vkbd/e_mod_main.c
+src/modules/vkbd/e_kbd_send.c
+src/modules/vkbd/e_kbd_int.c
+src/modules/vkbd/e_kbd_buf.c
+src/modules/vkbd/e_kbd_dict.c
+src/modules/vkbd/e_kbd_cfg.c
+src/modules/notification/e_mod_popup.c
+src/modules/notification/e_mod_config.c
+src/modules/notification/e_mod_main.c
+src/modules/luncher/config.c
+src/modules/luncher/mod.c
+src/modules/luncher/grid.c
+src/modules/luncher/bar.c
+src/modules/everything/evry_plug_text.c
+src/modules/everything/evry_history.c
+src/modules/everything/evry_plug_clipboard.c
+src/modules/everything/evry_plug_calc.c
+src/modules/everything/evry_util.c
+src/modules/everything/evry_plug_collection.c
+src/modules/everything/evry.c
+src/modules/everything/evry_plug_windows.c
+src/modules/everything/md5.c
+src/modules/everything/evry_plugin.c
+src/modules/everything/evry_plug_actions.c
+src/modules/everything/evry_gadget.c
+src/modules/everything/e_mod_main.c
+src/modules/everything/evry_plug_settings.c
+src/modules/everything/evry_plug_apps.c
+src/modules/everything/evry_config.c
+src/modules/everything/evry_view_help.c
+src/modules/everything/evry_plug_aggregator.c
+src/modules/everything/evry_plug_files.c
+src/modules/everything/evry_view.c
+src/modules/everything/evry_view_tabs.c
+src/modules/cpufreq/e_mod_config.c
+src/modules/cpufreq/e_mod_main.c
+src/modules/geolocation/e_mod_main.c
+src/modules/conf_intl/e_int_config_imc_import.c
+src/modules/conf_intl/e_int_config_imc.c
+src/modules/conf_intl/e_mod_main.c
+src/modules/conf_intl/e_int_config_intl.c
+src/modules/teamwork/e_mod_tw.c
+src/modules/teamwork/wl.c
+src/modules/teamwork/e_mod_config.c
+src/modules/teamwork/e_mod_main.c
+src/modules/teamwork/x11.c
+src/modules/teamwork/wl_teamwork.c
+src/modules/lokker/lokker.c
+src/modules/lokker/e_mod_main.c
+src/modules/conf_interaction/e_int_config_mouse.c
+src/modules/conf_interaction/e_int_config_interaction.c
+src/modules/conf_interaction/e_mod_main.c
+src/modules/connman/e_mod_config.c
+src/modules/connman/e_connman.c
+src/modules/connman/e_mod_main.c
+src/modules/connman/agent.c
+src/modules/conf_applications/e_mod_main.c
+src/modules/conf_applications/e_int_config_defapps.c
+src/modules/conf_applications/e_int_config_apps.c
+src/modules/conf_applications/e_int_config_apps_personal.c
+src/modules/conf_applications/e_int_config_deskenv.c
+src/modules/quickaccess/e_mod_config.c
+src/modules/quickaccess/e_quickaccess_db.c
+src/modules/quickaccess/e_mod_main.c
+src/modules/quickaccess/e_mod_quickaccess.c
+src/modules/quickaccess/e_quickaccess_bindings.c
+src/modules/mixer/e_mod_config.c
+src/modules/mixer/e_mod_main.c
+src/modules/mixer/gadget/mod.c
+src/modules/mixer/gadget/backend.c
+src/modules/mixer/gadget/mixer.c
+src/modules/mixer/emixer.c
+src/modules/mixer/lib/backends/alsa/alsa.c
+src/modules/mixer/lib/backends/pulseaudio/pulse.c
+src/modules/mixer/lib/backends/pulseaudio/pulse_ml.c
+src/modules/mixer/lib/emix.c
+src/modules/tasks/e_mod_config.c
+src/modules/tasks/e_mod_main.c
+src/modules/music-control/ui.c
+src/modules/music-control/e_mod_main.c
+src/modules/conf/e_mod_config.c
+src/modules/conf/e_mod_main.c
+src/modules/conf/e_conf.c
+src/modules/start/e_mod_main.c
+src/modules/start/start.c
+src/modules/pager/e_mod_config.c
+src/modules/pager/e_mod_main.c
+src/modules/pager/gadget/config.c
+src/modules/pager/gadget/pager.c
+src/modules/pager/gadget/mod.c
+src/modules/wl_x11/e_mod_main.c
+src/modules/battery/e_mod_config.c
+src/modules/battery/e_mod_udev.c
+src/modules/battery/e_mod_upower.c
+src/modules/battery/e_mod_sysctl.c
+src/modules/battery/e_mod_main.c
+src/modules/battery/batget.c
+src/bin/e_gadget_loader.c
+src/bin/e_scale.c
+src/bin/system/e_system_rfkill.c
+src/bin/system/e_system_ddc.c
+src/bin/system/e_system_inout.c
+src/bin/system/e_system_l2ping.c
+src/bin/system/e_system_main.c
+src/bin/system/e_system_power.c
+src/bin/system/e_system_cpufreq.c
+src/bin/system/e_system_backlight.c
+src/bin/system/e_system_storage.c
+src/bin/e_focus.c
+src/bin/e_fm_cmdline.c
+src/bin/e_filereg.c
+src/bin/e_comp_wl_extensions.c
+src/bin/e_widget_radio.c
+src/bin/e_widget.c
+src/bin/e_place.c
+src/bin/e_widget_table.c
+src/bin/e_layout.c
+src/bin/e_acpi.c
+src/bin/e_video.c
+src/bin/e_hints.c
+src/bin/e_intl.c
+src/bin/e_fm_shared_device.c
+src/bin/e_thumb_main.c
+src/bin/e_elm_cfgtool_main.c
+src/bin/e_update.c
+src/bin/e_atoms.c
+src/bin/e_imc_main.c
+src/bin/e_int_toolbar_config.c
+src/bin/e_widget_slider.c
+src/bin/e_dbusmenu.c
+src/bin/e_fm_prop.c
+src/bin/e_datastore.c
+src/bin/e_moveresize.c
+src/bin/e_config.c
+src/bin/e_comp_wl_data.c
+src/bin/e_fm_custom.c
+src/bin/e_object.c
+src/bin/e_desklock.c
+src/bin/e_int_client_remember.c
+src/bin/e_static_grab.c
+src/bin/e_comp_cfdata.c
+src/bin/e_log.c
+src/bin/e_startup.c
+src/bin/e_deskmirror.c
+src/bin/e_dpms.c
+src/bin/e_auth.c
+src/bin/e_font.c
+src/bin/e_utils.c
+src/bin/e_msgbus.c
+src/bin/e_gadcon.c
+src/bin/e_widget_label.c
+src/bin/e_fm_op.c
+src/bin/e_int_config_comp.c
+src/bin/e_main.c
+src/bin/e_mouse.c
+src/bin/e_deskenv.c
+src/bin/e_widget_textblock.c
+src/bin/e_widget_font_preview.c
+src/bin/e_pointer.c
+src/bin/e_widget_preview.c
+src/bin/e_ckpasswd_main.c
+src/bin/e_flowlayout.c
+src/bin/e_widget_flist.c
+src/bin/e_env.c
+src/bin/e_comp_wl_extensions_tizen.c
+src/bin/e_dnd.c
+src/bin/e_gadget_runner.c
+src/bin/e_askpass_main.c
+src/bin/e_msg.c
+src/bin/e_import_config_dialog.c
+src/bin/e_comp_x.c
+src/bin/e_gadcon_popup.c
+src/bin/e_widget_config_list.c
+src/bin/e_init.c
+src/bin/e_thumb.c
+src/bin/e_slidesel.c
+src/bin/e_intl_data.c
+src/bin/e_order.c
+src/bin/e_livethumb.c
+src/bin/e_zone.c
+src/bin/e_sys_main.c
+src/bin/e_widget_list.c
+src/bin/e_comp_wl_input.c
+src/bin/e_fm_mime.c
+src/bin/e_wallpaper_gen_main.c
+src/bin/e_alert.c
+src/bin/e_zoomap.c
+src/bin/e_widget_toolbook.c
+src/bin/e_entry_dialog.c
+src/bin/e_widget_image.c
+src/bin/e_resist.c
+src/bin/e_spectrum.c
+src/bin/e_confirm_dialog.c
+src/bin/e_maximize.c
+src/bin/e_pan.c
+src/bin/e_pixmap.c
+src/bin/e_about.c
+src/bin/e_widget_scrollframe.c
+src/bin/e_config_data.c
+src/bin/e_sys.c
+src/bin/e_sha1.c
+src/bin/e_comp_object.c
+src/bin/e_ipc.c
+src/bin/e_system.c
+src/bin/e_open.c
+src/bin/e_comp_wl.c
+src/bin/e_widget_fsel.c
+src/bin/e_client_volume.c
+src/bin/e_color.c
+src/bin/e_shelf.c
+src/bin/e_test.c
+src/bin/e_int_config_modules.c
+src/bin/e_sys_l2ping.c
+src/bin/e_widget_button.c
+src/bin/e_import_dialog.c
+src/bin/e_ilist.c
+src/bin/e_bryce.c
+src/bin/e_gadget.c
+src/bin/e_widget_frametable.c
+src/bin/e_color_dialog.c
+src/bin/e_ipc_codec.c
+src/bin/e_xkb.c
+src/bin/e_desk.c
+src/bin/e_user.c
+src/bin/e_theme.c
+src/bin/e_icon.c
+src/bin/e_theme_about.c
+src/bin/e_comp.c
+src/bin/e_xsettings.c
+src/bin/e_desktop_editor.c
+src/bin/efx/efx_spin.c
+src/bin/efx/efx_rotate.c
+src/bin/efx/efx_helpers.c
+src/bin/efx/efx_resize.c
+src/bin/efx/efx_util.c
+src/bin/efx/efx.c
+src/bin/efx/efx_queue.c
+src/bin/efx/efx_bumpmapping.c
+src/bin/efx/efx_zoom.c
+src/bin/efx/efx_move.c
+src/bin/efx/efx_pan.c
+src/bin/efx/efx_fade.c
+src/bin/e_widget_filepreview.c
+src/bin/e_dialog.c
+src/bin/e_fm/e_fm_main.c
+src/bin/e_fm/e_fm_main_eeze.c
+src/bin/e_fm/e_fm_main_udisks.c
+src/bin/e_fm/e_fm_main_udisks2.c
+src/bin/e_fm/e_fm_ipc.c
+src/bin/e_screensaver.c
+src/bin/e_fm.c
+src/bin/e_win.c
+src/bin/e_menu.c
+src/bin/e_module.c
+src/bin/e_widget_entry.c
+src/bin/e_backlight.c
+src/bin/e_path.c
+src/bin/e_bindings.c
+src/bin/e_widget_color_well.c
+src/bin/e_signals.c
+src/bin/e_slidecore.c
+src/bin/e_bryce_editor.c
+src/bin/e_prefix.c
+src/bin/e_comp_wl_dmabuf.c
+src/bin/e_toolbar.c
+src/bin/e_powersave.c
+src/bin/e_comp_x_randr.c
+src/bin/e_widget_spectrum.c
+src/bin/e_widget_aspect.c
+src/bin/e_exec.c
+src/bin/e_remember.c
+src/bin/e_bg.c
+src/bin/e_fm_shared_codec.c
+src/bin/e_randr2.c
+src/bin/e_notification.c
+src/bin/e_widget_ilist.c
+src/bin/e_comp_canvas.c
+src/bin/e_widget_framelist.c
+src/bin/e_xinerama.c
+src/bin/e_fm_device.c
+src/bin/e_error.c
+src/bin/e_widget_toolbar.c
+src/bin/e_fm_op_registry.c
+src/bin/e_slider.c
+src/bin/e_int_client_locks.c
+src/bin/e_obj_dialog.c
+src/bin/e_int_shelf_config.c
+src/bin/e_int_gadcon_config.c
+src/bin/e_int_menus.c
+src/bin/e_start_main.c
+src/bin/e_actions.c
+src/bin/e_grab_dialog.c
+src/bin/e_int_config_comp_match.c
+src/bin/e_client.c
+src/bin/e_alert_main.c
+src/bin/e_exehist.c
+src/bin/e_int_client_prop.c
+src/bin/e_config_dialog.c
+src/bin/e_configure.c
+src/bin/e_widget_check.c
+src/bin/e_scrollframe.c
+src/bin/e_grabinput.c
+src/bin/e_int_client_menu.c
+src/bin/e_widget_bgpreview.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0df5527a0..9f764c6b1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,58 +1,73 @@
-src/modules/battery/module.desktop.in
-src/modules/clock/module.desktop.in
-src/modules/conf/module.desktop.in
-src/modules/conf_applications/module.desktop.in
-src/modules/conf_borders/module.desktop.in
-src/modules/conf_clientlist/module.desktop.in
-src/modules/conf_colors/module.desktop.in
-src/modules/conf_desk/module.desktop.in
-src/modules/conf_desklock/module.desktop.in
-src/modules/conf_desks/module.desktop.in
-src/modules/conf_dialogs/module.desktop.in
-src/modules/conf_display/module.desktop.in
-src/modules/conf_dpms/module.desktop.in
-src/modules/conf_engine/module.desktop.in
-src/modules/conf_exebuf/module.desktop.in
-src/modules/conf_fonts/module.desktop.in
-src/modules/conf_icon_theme/module.desktop.in
-src/modules/conf_imc/module.desktop.in
-src/modules/conf_interaction/module.desktop.in
-src/modules/conf_intl/module.desktop.in
-src/modules/conf_bindings/module.desktop.in
-src/modules/conf_menus/module.desktop.in
-src/modules/conf_mime/module.desktop.in
-src/modules/conf_mouse/module.desktop.in
-src/modules/conf_mouse_cursor/module.desktop.in
-src/modules/conf_mousebindings/module.desktop.in
-src/modules/conf_paths/module.desktop.in
-src/modules/conf_performance/module.desktop.in
-src/modules/conf_profiles/module.desktop.in
-src/modules/conf_scale/module.desktop.in
-src/modules/conf_screensaver/module.desktop.in
-src/modules/conf_shelves/module.desktop.in
-src/modules/conf_startup/module.desktop.in
-src/modules/conf_theme/module.desktop.in
-src/modules/conf_transitions/module.desktop.in
-src/modules/conf_wallpaper/module.desktop.in
-src/modules/conf_window_display/module.desktop.in
-src/modules/conf_window_focus/module.desktop.in
-src/modules/conf_window_manipulation/module.desktop.in
-src/modules/conf_winlist/module.desktop.in
-src/modules/cpufreq/module.desktop.in
-src/modules/everything/module.desktop.in
-src/modules/everything-apps/module.desktop.in
-src/modules/everything-aspell/module.desktop.in
-src/modules/everything-calc/module.desktop.in
-src/modules/everything-files/module.desktop.in
-src/modules/everything-settings/module.desktop.in
-src/modules/everything-wallpaper/module.desktop.in
-src/modules/everything-windows/module.desktop.in
-src/modules/exebuf/module.desktop.in
-src/modules/fileman/module.desktop.in
-src/modules/fileman_opinfo/module.desktop.in
-src/modules/ibar/module.desktop.in
-src/modules/ibox/module.desktop.in
-src/modules/layout/module.desktop.in
-src/modules/msgbus_lang/module.desktop.in
-src/modules/pager/module.desktop.in
-src/modules/start/module.desktop.in
+data/session/enlightenment.desktop.in
+build/data/session/enlightenment.desktop
+build/data/desktop
+data/desktop
+data/desktop/enlightenment_askpass.desktop
+data/desktop/enlightenment_filemanager.desktop
+data/favorites/home.desktop
+data/favorites/tmp.desktop
+data/favorites/root.desktop
+data/favorites/desktop.desktop
+data/config/tiling/profile.desktop
+data/config/standard/profile.desktop
+data/config/default/profile.desktop
+src/modules/conf_paths/module.desktop
+src/modules/fileman_opinfo/module.desktop
+src/modules/bluez5/module.desktop
+src/modules/gadman/module.desktop
+src/modules/layout/module.desktop
+src/modules/ibar/module.desktop
+src/modules/backlight/module.desktop
+src/modules/conf_performance/module.desktop
+src/modules/conf_shelves/module.desktop
+src/modules/conf_theme/module.desktop
+src/modules/conf_randr/module.desktop
+src/modules/conf_display/module.desktop
+src/modules/sysinfo/module.desktop
+src/modules/winlist/module.desktop
+src/modules/xkbswitch/module.desktop
+src/modules/clock/module.desktop
+src/modules/conf_dialogs/module.desktop
+src/modules/wireless/module.desktop
+src/modules/systray/module.desktop
+src/modules/temperature/module.desktop
+src/modules/tiling/module.desktop
+src/modules/ibox/module.desktop
+src/modules/msgbus/module.desktop
+src/modules/conf_window_manipulation/module.desktop
+src/modules/conf_bindings/module.desktop
+src/modules/conf_window_remembers/module.desktop
+src/modules/wl_desktop_shell/module.desktop
+src/modules/shot/module.desktop
+src/modules/shot/data/shots.desktop
+src/modules/time/module.desktop
+src/modules/packagekit/module.desktop
+src/modules/appmenu/module.desktop
+src/modules/fileman/module.desktop
+src/modules/conf_menus/module.desktop
+src/modules/polkit/module.desktop
+src/modules/wizard/data/desktop
+src/modules/wizard/data/desktop/home.desktop
+src/modules/wizard/data/desktop/tmp.desktop
+src/modules/wizard/data/desktop/root.desktop
+src/modules/syscon/module.desktop
+src/modules/vkbd/module.desktop
+src/modules/notification/module.desktop
+src/modules/luncher/module.desktop
+src/modules/everything/module.desktop
+src/modules/cpufreq/module.desktop
+src/modules/geolocation/module.desktop
+src/modules/conf_intl/module.desktop
+src/modules/teamwork/module.desktop
+src/modules/conf_interaction/module.desktop
+src/modules/connman/module.desktop
+src/modules/conf_applications/module.desktop
+src/modules/quickaccess/module.desktop
+src/modules/mixer/emixer.desktop
+src/modules/mixer/module.desktop
+src/modules/tasks/module.desktop
+src/modules/music-control/module.desktop
+src/modules/conf/module.desktop
+src/modules/start/module.desktop
+src/modules/pager/module.desktop
+src/modules/battery/module.desktop