[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream, updated. 045506e8ef38b59772c640d64009428a5a67aa2b

Jan Luebbe jluebbe at debian.org
Sat May 24 15:59:03 UTC 2008


The following commit has been merged in the upstream branch:
commit 160062f585f4ed7ac254f38f9280644f08d2f173
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Sat May 24 17:51:04 2008 +0200

    Import upstream release 0.16.999.043

diff --git a/Makefile.am b/Makefile.am
index f031c55..dac1065 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,17 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in acconfig.h \
-		       enlightenment.spec
+		       enlightenment.spec enlightenment.pc
 
 bin_SCRIPTS = enlightenment-config
 
 EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
-             enlightenment.spec.in enlightenment.spec
+             enlightenment.spec.in enlightenment.spec enlightenment.pc
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
 
 ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = enlightenment.pc
diff --git a/Makefile.in b/Makefile.in
index 824c0f4..9b4c6a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,10 +40,10 @@ host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/enlightenment-config.in \
-	$(srcdir)/enlightenment.spec.in $(top_srcdir)/configure \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS compile \
-	config.guess config.rpath config.sub depcomp install-sh \
-	ltmain.sh missing mkinstalldirs
+	$(srcdir)/enlightenment.pc.in $(srcdir)/enlightenment.spec.in \
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL NEWS compile config.guess config.rpath config.sub \
+	depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
@@ -58,8 +58,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = enlightenment.spec enlightenment-config
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)"
+CONFIG_CLEAN_FILES = enlightenment.spec enlightenment.pc \
+	enlightenment-config
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)" \
+	"$(DESTDIR)$(pkgconfigdir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
@@ -77,7 +79,8 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 filesDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(files_DATA)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA) $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -103,6 +106,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -115,6 +120,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -134,6 +140,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -159,6 +167,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -251,15 +260,17 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in acconfig.h \
-		       enlightenment.spec
+		       enlightenment.spec enlightenment.pc
 
 bin_SCRIPTS = enlightenment-config
 EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
-             enlightenment.spec.in enlightenment.spec
+             enlightenment.spec.in enlightenment.spec enlightenment.pc
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
 ACLOCAL_AMFLAGS = -I m4
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = enlightenment.pc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -316,6 +327,8 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 enlightenment.spec: $(top_builddir)/config.status $(srcdir)/enlightenment.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+enlightenment.pc: $(top_builddir)/config.status $(srcdir)/enlightenment.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 enlightenment-config: $(top_builddir)/config.status $(srcdir)/enlightenment-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -364,6 +377,23 @@ uninstall-filesDATA:
 	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
 	done
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -500,7 +530,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/data/xsession $(distdir)/m4 $(distdir)/po $(distdir)/src/modules/battery $(distdir)/src/modules/clock $(distdir)/src/modules/conf $(distdir)/src/modules/conf_applications $(distdir)/src/modules/conf_borders $(distdir)/src/modules/conf_clientlist $(distdir)/src/modules/conf_colors $(distdir)/src/modules/conf_desk $(distdir)/src/modules/conf_desklock $(distdir)/src/modules/conf_desks $(distdir)/src/modules/conf_dialogs $(distdir)/src/modules/conf_display $(distdir)/src/modules/conf_dpms $(distdir)/src/modules/conf_engine $(distdir)/src/modules/conf_exebuf $(distdir)/src/modules/conf_fonts $(distdir)/src/modules/conf_icon_theme $(distdir)/src/modules/conf_imc $(distdir)/src/modules/conf_interaction $(distdir)/src/modules/conf_intl $(distdir)/src/modules/conf_keybindings $(distdir)/src/modules/conf_menus $(distdir)/src/modules/conf_mime $(distdir)/src/modules/conf_mouse $(distdir)/src/modules/conf_mouse_cursor $(distdir)/src/modules/conf_mousebindings $(distdir)/src/modules/conf_paths $(distdir)/src/modules/conf_performance $(distdir)/src/modules/conf_profiles $(distdir)/src/modules/conf_screensaver $(distdir)/src/modules/conf_shelves $(distdir)/src/modules/conf_startup $(distdir)/src/modules/conf_theme $(distdir)/src/modules/conf_transitions $(distdir)/src/modules/conf_wallpaper $(distdir)/src/modules/conf_window_display $(distdir)/src/modules/conf_window_focus $(distdir)/src/modules/conf_window_manipulation $(distdir)/src/modules/conf_winlist $(distdir)/src/modules/cpufreq $(distdir)/src/modules/dropshadow $(distdir)/src/modules/exebuf $(distdir)/src/modules/fileman $(distdir)/src/modules/ibar $(distdir)/src/modules/ibox $(distdir)/src/modules/layout $(distdir)/src/modules/msgbus_lang $(distdir)/src/modules/pager $(distdir)/src/modules/start $(distdir)/src/modules/temperature $(distdir)/src/modules/winlist $(distdir)/src/modules/wizard
+	$(mkdir_p) $(distdir)/. $(distdir)/data/xsession $(distdir)/m4 $(distdir)/po $(distdir)/src/modules/battery $(distdir)/src/modules/clock $(distdir)/src/modules/conf $(distdir)/src/modules/conf_applications $(distdir)/src/modules/conf_borders $(distdir)/src/modules/conf_clientlist $(distdir)/src/modules/conf_colors $(distdir)/src/modules/conf_desk $(distdir)/src/modules/conf_desklock $(distdir)/src/modules/conf_desks $(distdir)/src/modules/conf_dialogs $(distdir)/src/modules/conf_display $(distdir)/src/modules/conf_dpms $(distdir)/src/modules/conf_engine $(distdir)/src/modules/conf_exebuf $(distdir)/src/modules/conf_fonts $(distdir)/src/modules/conf_icon_theme $(distdir)/src/modules/conf_imc $(distdir)/src/modules/conf_interaction $(distdir)/src/modules/conf_intl $(distdir)/src/modules/conf_keybindings $(distdir)/src/modules/conf_menus $(distdir)/src/modules/conf_mime $(distdir)/src/modules/conf_mouse $(distdir)/src/modules/conf_mouse_cursor $(distdir)/src/modules/conf_mousebindings $(distdir)/src/modules/conf_paths $(distdir)/src/modules/conf_performance $(distdir)/src/modules/conf_profiles $(distdir)/src/modules/conf_screensaver $(distdir)/src/modules/conf_shelves $(distdir)/src/modules/conf_startup $(distdir)/src/modules/conf_theme $(distdir)/src/modules/conf_transitions $(distdir)/src/modules/conf_wallpaper $(distdir)/src/modules/conf_window_display $(distdir)/src/modules/conf_window_focus $(distdir)/src/modules/conf_window_manipulation $(distdir)/src/modules/conf_window_remembers $(distdir)/src/modules/conf_winlist $(distdir)/src/modules/cpufreq $(distdir)/src/modules/dropshadow $(distdir)/src/modules/exebuf $(distdir)/src/modules/fileman $(distdir)/src/modules/ibar $(distdir)/src/modules/ibox $(distdir)/src/modules/msgbus_lang $(distdir)/src/modules/pager $(distdir)/src/modules/start $(distdir)/src/modules/temperature $(distdir)/src/modules/winlist $(distdir)/src/modules/wizard
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -644,7 +674,7 @@ check: check-recursive
 all-am: Makefile $(SCRIPTS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -692,7 +722,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-filesDATA
+install-data-am: install-filesDATA install-pkgconfigDATA
 
 install-exec-am: install-binSCRIPTS
 
@@ -721,7 +751,7 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-filesDATA \
-	uninstall-info-am
+	uninstall-info-am uninstall-pkgconfigDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -734,13 +764,14 @@ uninstall-info: uninstall-info-recursive
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binSCRIPTS install-data \
 	install-data-am install-exec install-exec-am install-filesDATA \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
+	install-info install-info-am install-man install-pkgconfigDATA \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-filesDATA uninstall-info-am
+	uninstall-binSCRIPTS uninstall-filesDATA uninstall-info-am \
+	uninstall-pkgconfigDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/README b/README
index d4f5895..a8a0063 100644
--- a/README
+++ b/README
@@ -1,5 +1,18 @@
 Enlightenment 0.17.0 - IN DEVELOPMENT... not a RELEASE.
 
+Requirements:
+-------------
+
+Must:
+  libc libm libX11 libXext evas ecore ecore-evas ecore-file ecore-ipc ecore-con
+  ecore-job ecore-imf ecore-img-evas edje eet embryo efreet efreet-mime
+  edbus ecore-txt
+  [png loader in evas, jpeg loader in evas, eet loader in evas, software_x11
+  engine in evas, buffer engine in evas]
+
+Recommended:
+  libpam [xrender engine in evas]
+
 NOTE: Users of DR16 will need to rename the $prefix/bin/enlightenment
 file prior to installing DR17 or it will be overwritten.
 
@@ -10,16 +23,6 @@ of its own (recommended) like:
 
 You will, as usual need to add the subsequent bin dir to your $PATH etc.
 
-PREREQUISITES:
-
-The following Enlightenment Foundation Libraries are required by e17:
-  * eet
-  * evas
-  * ecore
-  * embryo
-  * edje
-  * efreet
-
 
 NOTES:
 
diff --git a/aclocal.m4 b/aclocal.m4
index a411506..7eb190e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -101,7 +101,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -203,6 +202,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -282,9 +283,80 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -609,7 +681,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -702,7 +778,7 @@ AC_CACHE_CHECK([$1], [$2],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -973,7 +1049,7 @@ else
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -981,7 +1057,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1298,7 +1374,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1831,6 +1907,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2330,7 +2413,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2766,7 +2849,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2823,6 +2906,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2932,7 +3016,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2945,7 +3029,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -3091,51 +3175,23 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
@@ -3386,7 +3442,7 @@ case $host_os in
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3821,7 +3877,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3946,6 +4003,11 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
@@ -4002,7 +4064,6 @@ solaris*)
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4087,7 +4148,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4264,6 +4325,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4326,7 +4388,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4563,6 +4625,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4912,7 +4978,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4969,7 +5035,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -5006,7 +5073,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -5102,7 +5169,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5253,7 +5320,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5323,7 +5391,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5460,7 +5529,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5484,7 +5553,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5500,7 +5569,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5522,6 +5591,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5552,12 +5622,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5607,7 +5679,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5827,7 +5899,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -5847,7 +5919,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -6007,11 +6079,10 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
diff --git a/configure b/configure
index 76d1255..2499f45 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for enlightenment 0.16.999.042.
+# Generated by GNU Autoconf 2.61 for enlightenment 0.16.999.043.
 #
 # Report bugs to <enlightenment-devel at lists.sourceforge.net>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='enlightenment'
 PACKAGE_TARNAME='enlightenment'
-PACKAGE_VERSION='0.16.999.042'
-PACKAGE_STRING='enlightenment 0.16.999.042'
+PACKAGE_VERSION='0.16.999.043'
+PACKAGE_STRING='enlightenment 0.16.999.043'
 PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
 
 ac_unique_file="configure.in"
@@ -859,6 +859,8 @@ LN_S
 ECHO
 AR
 RANLIB
+DSYMUTIL
+NMEDIT
 CXX
 CXXFLAGS
 ac_ct_CXX
@@ -910,8 +912,12 @@ ECORE_TXT_CFLAGS
 ECORE_TXT_LIBS
 TEMPERATURE_CFLAGS
 TEMPERATURE_LIBS
+BATTERY_CFLAGS
+BATTERY_LIBS
 HAVE_TEMPERATURE_TRUE
 HAVE_TEMPERATURE_FALSE
+HAVE_BATTERY_TRUE
+HAVE_BATTERY_FALSE
 E_DBUS_CFLAGS
 E_DBUS_LIBS
 E_HAL_CFLAGS
@@ -948,6 +954,8 @@ ECORE_TXT_CFLAGS
 ECORE_TXT_LIBS
 TEMPERATURE_CFLAGS
 TEMPERATURE_LIBS
+BATTERY_CFLAGS
+BATTERY_LIBS
 E_DBUS_CFLAGS
 E_DBUS_LIBS
 E_HAL_CFLAGS
@@ -1454,7 +1462,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures enlightenment 0.16.999.042 to adapt to many kinds of systems.
+\`configure' configures enlightenment 0.16.999.043 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1528,7 +1536,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of enlightenment 0.16.999.042:";;
+     short | recursive ) echo "Configuration of enlightenment 0.16.999.043:";;
    esac
   cat <<\_ACEOF
 
@@ -1591,6 +1599,10 @@ Some influential environment variables:
               C compiler flags for TEMPERATURE, overriding pkg-config
   TEMPERATURE_LIBS
               linker flags for TEMPERATURE, overriding pkg-config
+  BATTERY_CFLAGS
+              C compiler flags for BATTERY, overriding pkg-config
+  BATTERY_LIBS
+              linker flags for BATTERY, overriding pkg-config
   E_DBUS_CFLAGS
               C compiler flags for E_DBUS, overriding pkg-config
   E_DBUS_LIBS linker flags for E_DBUS, overriding pkg-config
@@ -1662,7 +1674,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-enlightenment configure 0.16.999.042
+enlightenment configure 0.16.999.043
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1676,7 +1688,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by enlightenment $as_me 0.16.999.042, which was
+It was created by enlightenment $as_me 0.16.999.043, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -3485,7 +3497,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='enlightenment'
- VERSION='0.16.999.042'
+ VERSION='0.16.999.043'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6722,7 +6734,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6937,7 +6949,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6940 "configure"' > conftest.$ac_ext
+  echo '#line 6952 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7109,7 +7121,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -8238,7 +8254,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -8553,7 +8568,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -9113,6 +9128,318 @@ fi
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=no
 enable_win32_dll=no
 
@@ -9178,7 +9505,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 
@@ -9206,11 +9533,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9209: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9213: \$? = $ac_status" >&5
+   echo "$as_me:9540: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9480,10 +9807,10 @@ if test -n "$lt_prog_compiler_pic"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -9496,27 +9823,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9826: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9503: \$? = $ac_status" >&5
+   echo "$as_me:9830: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -9543,10 +9870,10 @@ esac
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -9559,20 +9886,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -9600,11 +9927,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9603: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9930: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9607: \$? = $ac_status" >&5
+   echo "$as_me:9934: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9684,12 +10011,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -9748,7 +10076,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -9968,7 +10296,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -9988,7 +10316,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -10260,11 +10588,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -10784,7 +11111,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -11318,6 +11645,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -11637,7 +11979,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -11913,7 +12255,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -11962,7 +12304,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11965 "configure"
+#line 12307 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12062,7 +12404,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12065 "configure"
+#line 12407 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12189,7 +12531,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -12245,6 +12587,7 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -12305,7 +12648,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -12541,6 +12884,10 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -12789,6 +13136,7 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -12826,7 +13174,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -13033,7 +13381,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -13046,7 +13394,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -13304,51 +13652,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
@@ -13599,7 +13919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -14006,7 +14326,6 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -14108,6 +14427,11 @@ fi
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
 interix[3-9]*)
@@ -14163,7 +14487,6 @@ solaris*)
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -14239,7 +14562,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -14335,7 +14658,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -14466,10 +14789,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -14482,27 +14805,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14485: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14808: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14489: \$? = $ac_status" >&5
+   echo "$as_me:14812: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -14529,10 +14852,10 @@ esac
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14545,20 +14868,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -14586,11 +14909,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14589: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14912: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14593: \$? = $ac_status" >&5
+   echo "$as_me:14916: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14643,7 +14966,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -14665,6 +14988,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
@@ -14766,7 +15090,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15299,6 +15623,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -15382,6 +15721,7 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -15630,6 +15970,10 @@ predeps=$lt_predeps_CXX
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -15844,7 +16188,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -15882,7 +16226,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -16147,10 +16491,10 @@ if test -n "$lt_prog_compiler_pic_F77"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -16163,27 +16507,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16166: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16510: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16170: \$? = $ac_status" >&5
+   echo "$as_me:16514: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -16210,10 +16554,10 @@ esac
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -16226,20 +16570,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -16267,11 +16611,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16270: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16614: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16274: \$? = $ac_status" >&5
+   echo "$as_me:16618: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16351,12 +16695,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -16415,7 +16760,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -16635,7 +16980,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -16655,7 +17000,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -16907,11 +17252,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -17380,7 +17724,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17913,6 +18257,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -17996,6 +18355,7 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -18244,6 +18604,10 @@ predeps=$lt_predeps_F77
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -18418,7 +18782,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -18467,11 +18831,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18834: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18474: \$? = $ac_status" >&5
+   echo "$as_me:18838: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18531,7 +18895,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     darwin* | rhapsody*)
@@ -18601,7 +18965,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -18741,10 +19105,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -18757,27 +19121,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18760: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19124: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18764: \$? = $ac_status" >&5
+   echo "$as_me:19128: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -18804,10 +19168,10 @@ esac
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18820,20 +19184,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -18861,11 +19225,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18864: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19228: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18868: \$? = $ac_status" >&5
+   echo "$as_me:19232: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18945,12 +19309,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -19009,7 +19374,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -19229,7 +19594,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -19249,7 +19614,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -19521,11 +19886,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -19994,7 +20358,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -20527,6 +20891,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -20610,6 +20989,7 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -20858,6 +21238,10 @@ predeps=$lt_predeps_GCJ
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -21031,7 +21415,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -21091,6 +21475,7 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -21339,6 +21724,10 @@ predeps=$lt_predeps_RC
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -26279,7 +26668,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26295,7 +26684,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26314,7 +26703,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26342,7 +26731,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26358,7 +26747,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26377,7 +26766,7 @@ if test -n "$PKG_CONFIG"; then
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26411,7 +26800,7 @@ fi
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26428,7 +26817,7 @@ fi
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26448,7 +26837,7 @@ fi
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26474,7 +26863,7 @@ echo "$as_me: error: Package requirements (
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -26607,6 +26996,7 @@ else
 echo "${ECHO_T}yes" >&6; }
 
   have_temp="yes"
+  have_battery="yes"
   # This test will succeed as these modules are also checked before
 
 pkg_failed=no
@@ -26750,6 +27140,157 @@ echo "${ECHO_T}yes" >&6; }
 	:
 fi
 
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for BATTERY" >&5
+echo $ECHO_N "checking for BATTERY... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$BATTERY_CFLAGS"; then
+        pkg_cv_BATTERY_CFLAGS="$BATTERY_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    ecore
+    ecore-file
+    ecore-con
+  \"") >&5
+  ($PKG_CONFIG --exists --print-errors "
+    ecore
+    ecore-file
+    ecore-con
+  ") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_BATTERY_CFLAGS=`$PKG_CONFIG --cflags "
+    ecore
+    ecore-file
+    ecore-con
+  " 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$BATTERY_LIBS"; then
+        pkg_cv_BATTERY_LIBS="$BATTERY_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    ecore
+    ecore-file
+    ecore-con
+  \"") >&5
+  ($PKG_CONFIG --exists --print-errors "
+    ecore
+    ecore-file
+    ecore-con
+  ") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_BATTERY_LIBS=`$PKG_CONFIG --libs "
+    ecore
+    ecore-file
+    ecore-con
+  " 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        BATTERY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+    ecore
+    ecore-file
+    ecore-con
+  "`
+        else
+	        BATTERY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+    ecore
+    ecore-file
+    ecore-con
+  "`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$BATTERY_PKG_ERRORS" >&5
+
+	{ { echo "$as_me:$LINENO: error: Package requirements (
+    ecore
+    ecore-file
+    ecore-con
+  ) were not met:
+
+$BATTERY_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables BATTERY_CFLAGS
+and BATTERY_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (
+    ecore
+    ecore-file
+    ecore-con
+  ) were not met:
+
+$BATTERY_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables BATTERY_CFLAGS
+and BATTERY_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables BATTERY_CFLAGS
+and BATTERY_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables BATTERY_CFLAGS
+and BATTERY_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	BATTERY_CFLAGS=$pkg_cv_BATTERY_CFLAGS
+	BATTERY_LIBS=$pkg_cv_BATTERY_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	:
+fi
+
 fi
 
 
@@ -26763,6 +27304,16 @@ fi
 
 
 
+if test x$have_bat = "xyes"; then
+  HAVE_BATTERY_TRUE=
+  HAVE_BATTERY_FALSE='#'
+else
+  HAVE_BATTERY_TRUE='#'
+  HAVE_BATTERY_FALSE=
+fi
+
+
+
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for E_DBUS" >&5
 echo $ECHO_N "checking for E_DBUS... $ECHO_C" >&6; }
@@ -26973,7 +27524,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile enlightenment.spec src/Makefile src/bin/Makefile src/modules/Makefile src/modules/ibar/Makefile src/modules/ibar/module.desktop src/modules/dropshadow/Makefile src/modules/dropshadow/module.desktop src/modules/clock/Makefile src/modules/clock/module.desktop src/modules/pager/Makefile src/modules/pager/module.desktop src/modules/battery/Makefile src/modules/battery/module.desktop src/modules/temperature/Makefile src/modules/temperature/module.desktop src/modules/cpufreq/Makefile src/modules/cpufreq/module.desktop src/modules/ibox/Makefile src/modules/ibox/module.desktop src/modules/start/Makefile src/modules/start/module.desktop src/modules/layout/Makefile src/modules/layout/module.desktop src/modules/exebuf/Makefile src/modules/exebuf/module.desktop src/modules/winlist/Makefile src/modules/winlist/module.desktop src/modules/fileman/Makefile src/modules/fileman/module.desktop src/modules/wizard/Makefile src/modules/wizard/module.desktop src/modules/conf/Makefile src/modules/conf/module.desktop src/modules/conf_wallpaper/Makefile src/modules/conf_wallpaper/module.desktop src/modules/conf_theme/Makefile src/modules/conf_theme/module.desktop src/modules/conf_colors/Makefile src/modules/conf_colors/module.desktop src/modules/conf_fonts/Makefile src/modules/conf_fonts/module.desktop src/modules/conf_borders/Makefile src/modules/conf_borders/module.desktop src/modules/conf_icon_theme/Makefile src/modules/conf_icon_theme/module.desktop src/modules/conf_mouse_cursor/Makefile src/modules/conf_mouse_cursor/module.desktop src/modules/conf_transitions/Makefile src/modules/conf_transitions/module.desktop src/modules/conf_startup/Makefile src/modules/conf_startup/module.desktop src/modules/conf_intl/Makefile src/modules/conf_intl/module.desktop src/modules/conf_imc/Makefile src/modules/conf_imc/module.desktop src/modules/conf_profiles/Makefile src/modules/conf_profiles/module.desktop src/modules/msgbus_lang/Makefile src/modules/msgbus_lang/module.desktop src/modules/conf_engine/Makefile src/modules/conf_engine/module.desktop src/modules/conf_applications/Makefile src/modules/conf_applications/module.desktop src/modules/conf_desks/Makefile src/modules/conf_desks/module.desktop src/modules/conf_desk/Makefile src/modules/conf_desk/module.desktop src/modules/conf_display/Makefile src/modules/conf_display/module.desktop src/modules/conf_desklock/Makefile src/modules/conf_desklock/module.desktop src/modules/conf_screensaver/Makefile src/modules/conf_screensaver/module.desktop src/modules/conf_dpms/Makefile src/modules/conf_dpms/module.desktop src/modules/conf_shelves/Makefile src/modules/conf_shelves/module.desktop src/modules/conf_keybindings/Makefile src/modules/conf_keybindings/module.desktop src/modules/conf_mousebindings/Makefile src/modules/conf_mousebindings/module.desktop src/modules/conf_mouse/Makefile src/modules/conf_mouse/module.desktop src/modules/conf_window_display/Makefile src/modules/conf_window_display/module.desktop src/modules/conf_window_focus/Makefile src/modules/conf_window_focus/module.desktop src/modules/conf_window_manipulation/Makefile src/modules/conf_window_manipulation/module.desktop src/modules/conf_menus/Makefile src/modules/conf_menus/module.desktop src/modules/conf_clientlist/Makefile src/modules/conf_clientlist/module.desktop src/modules/conf_dialogs/Makefile src/modules/conf_dialogs/module.desktop src/modules/conf_performance/Makefile src/modules/conf_performance/module.desktop src/modules/conf_winlist/Makefile src/modules/conf_winlist/module.desktop src/modules/conf_exebuf/Makefile src/modules/conf_exebuf/module.desktop src/modules/conf_paths/Makefile src/modules/conf_paths/module.desktop src/modules/conf_mime/Makefile src/modules/conf_mime/module.desktop src/modules/conf_interaction/Makefile src/modules/conf_interaction/module.desktop src/preload/Makefile data/Makefile data/fonts/Makefile data/images/Makefile data/init/Makefile data/init/images/Makefile data/input_methods/Makefile data/themes/Makefile data/themes/images/Makefile data/other/Makefile data/xsession/Makefile data/xsession/enlightenment.desktop data/backgrounds/Makefile data/etc/Makefile data/icons/Makefile doc/Makefile po/Makefile.in enlightenment-config"
+ac_config_files="$ac_config_files Makefile enlightenment.spec enlightenment.pc src/Makefile src/bin/Makefile src/modules/Makefile src/modules/ibar/Makefile src/modules/ibar/module.desktop src/modules/dropshadow/Makefile src/modules/dropshadow/module.desktop src/modules/clock/Makefile src/modules/clock/module.desktop src/modules/pager/Makefile src/modules/pager/module.desktop src/modules/battery/Makefile src/modules/battery/module.desktop src/modules/temperature/Makefile src/modules/temperature/module.desktop src/modules/cpufreq/Makefile src/modules/cpufreq/module.desktop src/modules/ibox/Makefile src/modules/ibox/module.desktop src/modules/start/Makefile src/modules/start/module.desktop src/modules/exebuf/Makefile src/modules/exebuf/module.desktop src/modules/winlist/Makefile src/modules/winlist/module.desktop src/modules/fileman/Makefile src/modules/fileman/module.desktop src/modules/wizard/Makefile src/modules/wizard/module.desktop src/modules/conf/Makefile src/modules/conf/module.desktop src/modules/conf_wallpaper/Makefile src/modules/conf_wallpaper/module.desktop src/modules/conf_theme/Makefile src/modules/conf_theme/module.desktop src/modules/conf_colors/Makefile src/modules/conf_colors/module.desktop src/modules/conf_fonts/Makefile src/modules/conf_fonts/module.desktop src/modules/conf_borders/Makefile src/modules/conf_borders/module.desktop src/modules/conf_icon_theme/Makefile src/modules/conf_icon_theme/module.desktop src/modules/conf_mouse_cursor/Makefile src/modules/conf_mouse_cursor/module.desktop src/modules/conf_transitions/Makefile src/modules/conf_transitions/module.desktop src/modules/conf_startup/Makefile src/modules/conf_startup/module.desktop src/modules/conf_intl/Makefile src/modules/conf_intl/module.desktop src/modules/conf_imc/Makefile src/modules/conf_imc/module.desktop src/modules/conf_profiles/Makefile src/modules/conf_profiles/module.desktop src/modules/msgbus_lang/Makefile src/modules/msgbus_lang/module.desktop src/modules/conf_engine/Makefile src/modules/conf_engine/module.desktop src/modules/conf_applications/Makefile src/modules/conf_applications/module.desktop src/modules/conf_desks/Makefile src/modules/conf_desks/module.desktop src/modules/conf_desk/Makefile src/modules/conf_desk/module.desktop src/modules/conf_display/Makefile src/modules/conf_display/module.desktop src/modules/conf_desklock/Makefile src/modules/conf_desklock/module.desktop src/modules/conf_screensaver/Makefile src/modules/conf_screensaver/module.desktop src/modules/conf_dpms/Makefile src/modules/conf_dpms/module.desktop src/modules/conf_shelves/Makefile src/modules/conf_shelves/module.desktop src/modules/conf_keybindings/Makefile src/modules/conf_keybindings/module.desktop src/modules/conf_mousebindings/Makefile src/modules/conf_mousebindings/module.desktop src/modules/conf_mouse/Makefile src/modules/conf_mouse/module.desktop src/modules/conf_window_display/Makefile src/modules/conf_window_display/module.desktop src/modules/conf_window_focus/Makefile src/modules/conf_window_focus/module.desktop src/modules/conf_window_remembers/Makefile src/modules/conf_window_remembers/module.desktop src/modules/conf_window_manipulation/Makefile src/modules/conf_window_manipulation/module.desktop src/modules/conf_menus/Makefile src/modules/conf_menus/module.desktop src/modules/conf_clientlist/Makefile src/modules/conf_clientlist/module.desktop src/modules/conf_dialogs/Makefile src/modules/conf_dialogs/module.desktop src/modules/conf_performance/Makefile src/modules/conf_performance/module.desktop src/modules/conf_winlist/Makefile src/modules/conf_winlist/module.desktop src/modules/conf_exebuf/Makefile src/modules/conf_exebuf/module.desktop src/modules/conf_paths/Makefile src/modules/conf_paths/module.desktop src/modules/conf_mime/Makefile src/modules/conf_mime/module.desktop src/modules/conf_interaction/Makefile src/modules/conf_interaction/module.desktop src/preload/Makefile data/Makefile data/fonts/Makefile data/images/Makefile data/init/Makefile data/init/images/Makefile data/input_methods/Makefile data/themes/Makefile data/themes/images/Makefile data/other/Makefile data/xsession/Makefile data/xsession/enlightenment.desktop data/backgrounds/Makefile data/etc/Makefile data/icons/Makefile doc/Makefile po/Makefile.in enlightenment-config"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -27101,6 +27652,13 @@ echo "$as_me: error: conditional \"HAVE_TEMPERATURE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_BATTERY_TRUE}" && test -z "${HAVE_BATTERY_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_BATTERY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_BATTERY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${HAVE_EDBUS_TRUE}" && test -z "${HAVE_EDBUS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_EDBUS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -27408,7 +27966,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by enlightenment $as_me 0.16.999.042, which was
+This file was extended by enlightenment $as_me 0.16.999.043, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27461,7 +28019,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-enlightenment config.status 0.16.999.042
+enlightenment config.status 0.16.999.043
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -27586,6 +28144,7 @@ do
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "enlightenment.spec") CONFIG_FILES="$CONFIG_FILES enlightenment.spec" ;;
+    "enlightenment.pc") CONFIG_FILES="$CONFIG_FILES enlightenment.pc" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/bin/Makefile") CONFIG_FILES="$CONFIG_FILES src/bin/Makefile" ;;
     "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
@@ -27607,8 +28166,6 @@ do
     "src/modules/ibox/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/ibox/module.desktop" ;;
     "src/modules/start/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/start/Makefile" ;;
     "src/modules/start/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/start/module.desktop" ;;
-    "src/modules/layout/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/layout/Makefile" ;;
-    "src/modules/layout/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/layout/module.desktop" ;;
     "src/modules/exebuf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/exebuf/Makefile" ;;
     "src/modules/exebuf/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/exebuf/module.desktop" ;;
     "src/modules/winlist/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/winlist/Makefile" ;;
@@ -27673,6 +28230,8 @@ do
     "src/modules/conf_window_display/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_display/module.desktop" ;;
     "src/modules/conf_window_focus/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_focus/Makefile" ;;
     "src/modules/conf_window_focus/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_focus/module.desktop" ;;
+    "src/modules/conf_window_remembers/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_remembers/Makefile" ;;
+    "src/modules/conf_window_remembers/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_remembers/module.desktop" ;;
     "src/modules/conf_window_manipulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_manipulation/Makefile" ;;
     "src/modules/conf_window_manipulation/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/conf_window_manipulation/module.desktop" ;;
     "src/modules/conf_menus/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/conf_menus/Makefile" ;;
@@ -27864,13 +28423,13 @@ LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
 CXXDEPMODE!$CXXDEPMODE$ac_delim
 am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27912,6 +28471,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
 F77!$F77$ac_delim
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
@@ -27956,8 +28517,12 @@ ECORE_TXT_CFLAGS!$ECORE_TXT_CFLAGS$ac_delim
 ECORE_TXT_LIBS!$ECORE_TXT_LIBS$ac_delim
 TEMPERATURE_CFLAGS!$TEMPERATURE_CFLAGS$ac_delim
 TEMPERATURE_LIBS!$TEMPERATURE_LIBS$ac_delim
+BATTERY_CFLAGS!$BATTERY_CFLAGS$ac_delim
+BATTERY_LIBS!$BATTERY_LIBS$ac_delim
 HAVE_TEMPERATURE_TRUE!$HAVE_TEMPERATURE_TRUE$ac_delim
 HAVE_TEMPERATURE_FALSE!$HAVE_TEMPERATURE_FALSE$ac_delim
+HAVE_BATTERY_TRUE!$HAVE_BATTERY_TRUE$ac_delim
+HAVE_BATTERY_FALSE!$HAVE_BATTERY_FALSE$ac_delim
 E_DBUS_CFLAGS!$E_DBUS_CFLAGS$ac_delim
 E_DBUS_LIBS!$E_DBUS_LIBS$ac_delim
 E_HAL_CFLAGS!$E_HAL_CFLAGS$ac_delim
@@ -27972,7 +28537,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index aec0b0a..c5e979b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(enlightenment, 0.16.999.042, enlightenment-devel at lists.sourceforge.net)
+AC_INIT(enlightenment, 0.16.999.043, enlightenment-devel at lists.sourceforge.net)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
@@ -191,7 +191,7 @@ PKG_CHECK_MODULES(E, [
   ecore-imf
   ecore-imf-evas
   edje
-  eet
+  eet >= 1.0.1
   embryo
   efreet
   efreet-mime
@@ -201,13 +201,20 @@ PKG_CHECK_MODULES(ECORE_TXT, [
   ecore-txt
 ], [
   have_temp="yes"
+  have_battery="yes"
   # This test will succeed as these modules are also checked before
   PKG_CHECK_MODULES(TEMPERATURE, [
     ecore
     ecore-file
   ])
+  PKG_CHECK_MODULES(BATTERY, [
+    ecore
+    ecore-file
+    ecore-con
+  ])
 ], [ have_temp="no"])
 AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
+AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes")
 
 PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no)
 PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no)
@@ -258,6 +265,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c
 AC_OUTPUT([
 Makefile
 enlightenment.spec
+enlightenment.pc
 src/Makefile
 src/bin/Makefile
 src/modules/Makefile
@@ -279,8 +287,6 @@ src/modules/ibox/Makefile
 src/modules/ibox/module.desktop
 src/modules/start/Makefile
 src/modules/start/module.desktop
-src/modules/layout/Makefile
-src/modules/layout/module.desktop
 src/modules/exebuf/Makefile
 src/modules/exebuf/module.desktop
 src/modules/winlist/Makefile
@@ -345,6 +351,8 @@ src/modules/conf_window_display/Makefile
 src/modules/conf_window_display/module.desktop
 src/modules/conf_window_focus/Makefile
 src/modules/conf_window_focus/module.desktop
+src/modules/conf_window_remembers/Makefile
+src/modules/conf_window_remembers/module.desktop
 src/modules/conf_window_manipulation/Makefile
 src/modules/conf_window_manipulation/module.desktop
 src/modules/conf_menus/Makefile
diff --git a/data/Makefile.in b/data/Makefile.in
index 1c5a7a1..e5bba40 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -72,6 +72,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -84,6 +86,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +106,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -128,6 +133,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/backgrounds/Makefile.in b/data/backgrounds/Makefile.in
index ad9524a..4b17f3c 100644
--- a/data/backgrounds/Makefile.in
+++ b/data/backgrounds/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/etc/Makefile.in b/data/etc/Makefile.in
index fb58b96..523d59a 100644
--- a/data/etc/Makefile.in
+++ b/data/etc/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/fonts/Makefile.in b/data/fonts/Makefile.in
index b1f620d..efca9ae 100644
--- a/data/fonts/Makefile.in
+++ b/data/fonts/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 7bc983f..a595373 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/images/Makefile.in b/data/images/Makefile.in
index f3bc2a5..81dc600 100644
--- a/data/images/Makefile.in
+++ b/data/images/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/init/Makefile.in b/data/init/Makefile.in
index 7799e8a..24b37ad 100644
--- a/data/init/Makefile.in
+++ b/data/init/Makefile.in
@@ -82,6 +82,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -94,6 +96,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -113,6 +116,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -138,6 +143,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/init/images/Makefile.in b/data/init/images/Makefile.in
index 5740d32..64ce11b 100644
--- a/data/init/images/Makefile.in
+++ b/data/init/images/Makefile.in
@@ -63,6 +63,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -75,6 +77,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -94,6 +97,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -119,6 +124,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/input_methods/Makefile.in b/data/input_methods/Makefile.in
index 55a4209..9f7d4da 100644
--- a/data/input_methods/Makefile.in
+++ b/data/input_methods/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/other/Makefile.in b/data/other/Makefile.in
index 72453b2..ec3b2c1 100644
--- a/data/other/Makefile.in
+++ b/data/other/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index e7d2e7d..56a8e8b 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -61,7 +61,8 @@ default_sys.edc \
 default_deskpreview.edc \
 default_fontpreview.edc \
 default_wizard.edc \
-default_toolbar.edc
+default_toolbar.edc \
+default_slidesel.edc
 
 default.edj: Makefile $(EXTRA_DIST)
 	$(EDJE_CC) $(EDJE_FLAGS) \
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index e8b0d33..20f2da4 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -82,6 +82,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -94,6 +96,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -113,6 +116,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -138,6 +143,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -287,7 +293,8 @@ default_sys.edc \
 default_deskpreview.edc \
 default_fontpreview.edc \
 default_wizard.edc \
-default_toolbar.edc
+default_toolbar.edc \
+default_slidesel.edc
 
 all: all-recursive
 
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 08cb61e..c7dc249 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -85,4 +85,5 @@ collections {
 #include "default_fontpreview.edc"
 #include "default_wizard.edc"
 #include "default_toolbar.edc"
+#include "default_slidesel.edc"
 }
diff --git a/data/themes/default_battery.edc b/data/themes/default_battery.edc
index aa3bc69..2223c0f 100644
--- a/data/themes/default_battery.edc
+++ b/data/themes/default_battery.edc
@@ -15,6 +15,7 @@ images {
 group {
    name: "e/modules/battery/main";
    max:  128 128;
+   min:  1   1;
    script {
     public message(Msg_Type:type, id, ...) {
        if ((type == MSG_FLOAT) && (id == 1)) {
@@ -295,3 +296,90 @@ group {
       }
    }
 }
+group {
+   name: "e/modules/battery/popup";
+   max:  420 96;
+   min:  240 64;
+   parts {
+      part {
+         name: "battery";
+         type: SWALLOW;
+         mouse_events: 1;
+         repeat_events: 1;
+         description {
+            state: "default" 0.0;
+            min: 1 1;
+            max: 120 120;
+            color: 255 255 255 255;
+            rel1 {
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               relative: 0.25 1.0;
+            }
+         }
+      }
+      part {
+         name: "text";
+         type: TEXT;
+         effect: SOFT_SHADOW;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: 120 1;
+            max: 300 48;
+            fixed: 1 1;
+            color: 255 255 255 255;
+            rel1 {
+               relative: 1.0 0.5;
+               to_x:battery;
+               offset: 0 -7;
+            }
+            rel2 {
+               relative: 1.0 0.5;
+               offset: 0 -7;
+            }
+             
+            text {
+               text: "Your battery is low!";
+               font: "Sans:style=Bold,Edje-Vera-Bold";
+               size: 10;
+               min: 1 1;
+               align: 0.5 1.0;
+               text_class: "module_large";
+            }
+         }
+      }
+      part {
+         name: "text2";
+         type: TEXT;
+         effect: SOFT_SHADOW;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            min: 120 1;
+            max: 300 48;
+            fixed: 1 1;
+            rel1 {
+               relative: 1.0 0.5;
+               to_x: battery;
+               offset: 5 7;
+            }
+            rel2 {
+               relative: 1.0 0.5;
+               offset: 0 7;
+            }
+            
+            text {
+               text: "AC power is recommended.";
+               font: "Sans:style=Bold,Edje-Vera-Bold";
+               size: 10;
+               min: 1 1;
+               align: 0.5 1.0;
+               text_class: "module_large";
+            }
+         }
+      }
+   }
+}
diff --git a/data/themes/default_configure.edc b/data/themes/default_configure.edc
index 5a822a2..4471a60 100644
--- a/data/themes/default_configure.edc
+++ b/data/themes/default_configure.edc
@@ -66,7 +66,7 @@ group {
 	 }
       }
       part {
-	 name:          "title";
+	 name:          "e.text.title";
 	 type:          TEXT;
 	 effect:        SOFT_SHADOW;
 	 mouse_events:  0;
@@ -88,7 +88,7 @@ group {
 	    color3: 0 0 0 32;
 	    color_class: "configure_title";
 	    text {
-	       text:     "Enlightenment Configuration";
+	       text:     "EC";
                font: "Sans:style=Bold,Edje-Vera-Bold";
 	       size:     16;
 	       min:      1 1;
diff --git a/data/themes/default_exebuf.edc b/data/themes/default_exebuf.edc
index 5eae2e4..22a4e20 100644
--- a/data/themes/default_exebuf.edc
+++ b/data/themes/default_exebuf.edc
@@ -256,7 +256,6 @@ group {
          effect: SHADOW;
 	 description {
 	    state: "default" 0.0;
-	    color: 0 0 0 255;
 	    fixed: 0 1;
 	    align: 0.0 0.5;
 	    rel1 {
diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc
index 1a2e1a4..8ee3e08 100644
--- a/data/themes/default_fileman.edc
+++ b/data/themes/default_fileman.edc
@@ -6949,7 +6949,7 @@ group {
 	       min:      0 1;
 	       align:    0.5 1.0;
 	       elipsis:  0.0;
-	       text_class: "desktop_fileman_icon";		  
+	       text_class: "desktop_icon";		  
 	    }
 	 }
       }	 
@@ -7270,7 +7270,7 @@ group {
 	       min:      0 1;
 	       align:    0.5 1.0;
 	       elipsis:  0.0;
-	       text_class: "desktop_fileman_icon";		  
+	       text_class: "desktop_icon";		  
 	    }
 	 }
       }	 
diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index 949d73f..08d8825 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -105,6 +105,8 @@ images {
    image: "e17_icon_startup_applications.png" COMP;
    image: "e17_icon_power_management.png" COMP;
    image: "e17_icon_screensaver.png" COMP;
+
+   image: "e17_icon_window_remembers.png" COMP;
 }
 
 group {
@@ -2248,6 +2250,25 @@ group {
       }
    }
 }
+group {
+   name: "e/icons/enlightenment/window_remembers";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_window_remembers.png";
+	    }
+	 }
+      }
+   }
+}   
 
 
 
diff --git a/data/themes/default_slidesel.edc b/data/themes/default_slidesel.edc
new file mode 100644
index 0000000..3af1f3a
--- /dev/null
+++ b/data/themes/default_slidesel.edc
@@ -0,0 +1,138 @@
+images {
+   image: "focus.png" COMP;
+}
+group {
+   name: "e/widgets/slidesel";
+   parts {
+      part {
+	 name: "clipper";
+	 type: RECT;
+	 mouse_events: 0;
+	 description {
+	    state: "default" 0.0;
+	    rel1 {
+	       to_y: "e.text.label";
+	       relative: 0.0 1.0;
+	       offset: 0 4;
+	    }
+	    rel2 {
+	       offset: -5  -5;
+	    }
+	 }
+      }
+      part {
+	 name: "e.swallow.content";
+	 clip_to: "clipper";
+	 type: SWALLOW;
+	 description {
+	    state: "default" 0.0;
+	    rel1.to: "clipper";
+	    rel2.to: "clipper";
+	 }
+      }
+      part {
+	 name: "e.text.label";
+	 type: TEXT;
+	 effect: SOFT_SHADOW;
+	 mouse_events: 0;
+	 description {
+	    state: "default" 0.0;
+	    rel1 {
+	       relative: 0.0 0.0;
+	       offset: 4 4;
+	    }
+	    rel2 {
+	       relative: 1.0 0.0;
+	       offset: -5 4;
+	    }
+	    align: 0.0 0.0;
+	    color: 255 255 255 255;
+	    color3: 0 0 0 16;
+	    text {
+	       font: "Sans:style=Bold,Edje-Vera-Bold";
+	       size: 20;
+	       min: 0 1;
+	       align: 0.0 0.0;
+	       text_class: "slidesel_label";
+	    }
+	 }
+      }
+      part {
+	 name: "focus";
+	 mouse_events: 0;
+	 description {
+	    state: "default" 0.0;
+	    visible: 0;
+	    color: 255 255 255 0;
+	    image {
+	       normal: "focus.png";
+	       border: 7 7 7 7;
+	       middle: 0;
+	    }
+	    fill {
+	       smooth: 0;
+	    }
+	 }
+	 description {
+	    state: "focused" 0.0;
+	    inherit: "default" 0.0;
+	    visible: 1;
+	    color: 255 255 255 255;
+	 }
+      }
+   }
+   programs {
+      program {
+	 name: "focus_in";
+	 signal: "e,state,focused";
+	 source: "e";
+         action: STATE_SET "focused" 0.0;
+	 transition: DECELERATE 0.2;
+	 target: "focus";
+      }
+      program {
+	 name: "focus_out";
+	 signal: "e,state,unfocused";
+	 source: "e";
+         action: STATE_SET "default" 0.0;
+	 transition: ACCELERATE 0.5;
+	 target: "focus";
+      }
+      program {
+	 name: "disable";
+	 signal: "e,state,disabled";
+	 source: "e";
+//	 action: STATE_SET "disabled" 0.0;
+//	 target: "outline";
+//	 target: "event";
+//	 target: "e.text.label";
+      }
+      program {
+	 name: "enable";
+	 signal: "e,state,enabled";
+	 source: "e";
+//	 action: STATE_SET "default" 0.0;
+//	 target: "outline";
+//	 target: "event";
+//	 target: "e.text.label";
+      }
+      program {
+	 name: "hint_on";
+	 signal: "e,state,slide,hint,on";
+	 source: "e";
+//	 action: STATE_SET "disabled" 0.0;
+//	 target: "outline";
+//	 target: "event";
+//	 target: "e.text.label";
+      }
+      program {
+	 name: "hint_off";
+	 signal: "e,state,slide,hint,off";
+	 source: "e";
+//	 action: STATE_SET "disabled" 0.0;
+//	 target: "outline";
+//	 target: "event";
+//	 target: "e.text.label";
+      }
+   }
+}
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index f94bd8f..5a089b9 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -557,4 +557,6 @@ e17_tl_corner_logo.png \
 e17_tl_corner_logo_shadow.png \
 e17_whitev.png \
 e17_wiz_b1.png \
-e17_wiz_b2.png
+e17_wiz_b2.png \
+e17_icon_window_remembers.png
+
diff --git a/data/themes/images/Makefile.in b/data/themes/images/Makefile.in
index bf33203..5e05acf 100644
--- a/data/themes/images/Makefile.in
+++ b/data/themes/images/Makefile.in
@@ -63,6 +63,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -75,6 +77,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -94,6 +97,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -119,6 +124,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -765,7 +771,8 @@ e17_tl_corner_logo.png \
 e17_tl_corner_logo_shadow.png \
 e17_whitev.png \
 e17_wiz_b1.png \
-e17_wiz_b2.png
+e17_wiz_b2.png \
+e17_icon_window_remembers.png
 
 all: all-am
 
diff --git a/data/themes/images/e17_icon_window_remembers.png b/data/themes/images/e17_icon_window_remembers.png
new file mode 100644
index 0000000..c3cc7ec
Binary files /dev/null and b/data/themes/images/e17_icon_window_remembers.png differ
diff --git a/data/xsession/Makefile.in b/data/xsession/Makefile.in
index 4230d46..61b8bc6 100644
--- a/data/xsession/Makefile.in
+++ b/data/xsession/Makefile.in
@@ -74,6 +74,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -86,6 +88,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -105,6 +108,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -130,6 +135,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 62671d1..bbb7380 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -73,6 +73,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -104,6 +107,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -129,6 +134,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/enlightenment.pc b/enlightenment.pc
new file mode 100644
index 0000000..9aa828e
--- /dev/null
+++ b/enlightenment.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/enlightenment
+
+Name: enlightenment
+Description: Enlightenmnt Window Manager
+Version: 0.16.999.043
+Libs: ${exec_prefix}/lib/enlightenment/modules
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/enlightenment.pc.in b/enlightenment.pc.in
new file mode 100644
index 0000000..c8d18e9
--- /dev/null
+++ b/enlightenment.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE@
+
+Name: enlightenment
+Description: Enlightenmnt Window Manager
+Version: @VERSION@
+Libs: @libdir@/@PACKAGE@/modules
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/enlightenment.spec b/enlightenment.spec
index 417e991..a496473 100644
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,6 +1,6 @@
 Summary: The Enlightenment window manager
 Name: enlightenment
-Version: 0.16.999.042
+Version: 0.16.999.043
 Release: 0.%(date '+%Y%m%d')
 License: BSD
 Group: User Interface/Desktops
diff --git a/ltmain.sh b/ltmain.sh
index 2160ef7..e420fac 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2,7 +2,7 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
 	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
 	  $lt_var=C
 	  export $lt_var
 	fi"
 done
 
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
+
 # Make sure IFS has a sensible default
 lt_nl='
 '
@@ -485,7 +491,7 @@ do
     echo "\
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
@@ -788,6 +794,7 @@ if test -z "$show_help"; then
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1646,6 +1654,11 @@ EOF
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -2152,7 +2165,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2948,12 +2966,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3101,9 +3125,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4245,9 +4270,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
 	eval "if test \"\${save_$lt_var+set}\" = set; then
 		$lt_var=\$save_$lt_var; export $lt_var
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0173481..64bc958 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -166,6 +166,8 @@ src/modules/conf_icon_theme/e_mod_main.c
 src/modules/conf_imc/e_int_config_imc.c
 src/modules/conf_imc/e_int_config_imc_import.c
 src/modules/conf_imc/e_mod_main.c
+src/modules/conf_interaction/e_int_config_interaction.c
+src/modules/conf_interaction/e_mod_main.c
 src/modules/conf_intl/e_int_config_intl.c
 src/modules/conf_intl/e_mod_main.c
 src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -201,6 +203,7 @@ src/modules/conf_transitions/e_mod_main.c
 src/modules/conf_wallpaper/e_int_config_wallpaper.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
 src/modules/conf_wallpaper/e_mod_main.c
 src/modules/conf_window_display/e_int_config_window_display.c
 src/modules/conf_window_display/e_mod_main.c
@@ -208,6 +211,8 @@ src/modules/conf_window_focus/e_int_config_focus.c
 src/modules/conf_window_focus/e_mod_main.c
 src/modules/conf_window_manipulation/e_int_config_window_manipulation.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/conf_winlist/e_int_config_winlist.c
 src/modules/conf_winlist/e_mod_main.c
 src/modules/cpufreq/e_mod_main.c
@@ -225,7 +230,6 @@ src/modules/ibar/e_mod_config.c
 src/modules/ibar/e_mod_main.c
 src/modules/ibox/e_mod_config.c
 src/modules/ibox/e_mod_main.c
-src/modules/layout/e_mod_main.c
 src/modules/pager/e_mod_config.c
 src/modules/pager/e_mod_main.c
 src/modules/start/e_mod_main.c
diff --git a/po/bg.gmo b/po/bg.gmo
index 50375db..f7061fc 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 7e2d3fd..480a030 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-11-15 00:40+0200\n"
 "Last-Translator: Viktor Kojouharov <vkojouharov at abv.bg>\n"
 "Language-Team: English <en at li.org>\n"
@@ -20,8 +20,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "За Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -66,15 +66,15 @@ msgstr "Сигурни ли сте, че искате да убиете този
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Да"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Не"
 
@@ -132,334 +132,334 @@ msgid ""
 msgstr ""
 "Искате да изключите компютъра в режим \"hibernate\".<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Преместване"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Меню на прозореца"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Повдигане"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "По-ниско"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Убиване"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Прозорец : Състояния"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Режим на залепване"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Режим на скриване"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Режим на Цял Екран"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Уголемяване"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Уголемяване вертикално"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Уголемяване хоризонтално"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Уголемяване на цял екран"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим на уголемяване \"Умен\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим на уголемяване \"Разширяване\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим на уголемяване \"Запълване\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Режим на навиване нагоре"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Режим на навиване надолу"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Режим на навиване наляво"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Режим на навиване надясно"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Режим на навиване"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Премахване на рамката"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Състояние на забождане"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Поле"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -469,136 +469,136 @@ msgstr "Изпращане до поле..."
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Изпращане на мишката до екран 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Изпращане на мишката до екран 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Изпращане на мишката до екран..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Изпращане на мишката напред 1 екран "
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Изпращане на мишката назад 1 екран "
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Изпращане на мишката напред/назад екрани..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Прозорец : Движения"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "До следващото поле"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "До предишното поле"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "По поле #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "До поле..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Показване на главното меню"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Показване на предпочитаното меню"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Показване на меню \"Всички програми\""
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Показване на клиентско меню"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Показване на меню..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Стартиране"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Дефинирани команди"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Програма"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Рестартиране"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Незабавен изход"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Системни"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Изключване на компютъра"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Рестартиране на компютъра"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Временно изключване"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Временно изключване, запазване на информацията върху диска"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Заключване на екрана"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Изчистване на прозорци"
 
@@ -606,11 +606,11 @@ msgstr "Изчистване на прозорци"
 msgid "Set As Background"
 msgstr "Поставяне като фон"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "Сканиране на Desktop файлове завършено"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Сканиране на Desktop файлове"
 
@@ -650,11 +650,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Поле %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Конфигурацията е подновена"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -662,7 +662,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -672,7 +672,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -681,7 +681,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -690,7 +690,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -698,17 +698,16 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Проблем при запис на конфигурацията на E17"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -717,19 +716,20 @@ msgstr "Проблем при запис на конфигурацията на
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "Добре"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Сложни"
 
@@ -745,14 +745,14 @@ msgstr "Прилагане"
 msgid "Extensions"
 msgstr "Разширения"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Модули"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
@@ -814,7 +814,7 @@ msgid "Desktop Entry Editor"
 msgstr "Редактор на Desktop файлове"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Икона"
@@ -850,7 +850,7 @@ msgstr "Общо име"
 msgid "Window Class"
 msgstr "Клас на прозорец"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Категории"
@@ -897,6 +897,7 @@ msgstr "Избиране на икона"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -904,7 +905,7 @@ msgstr "Отказ"
 msgid "Select an Executable"
 msgstr "Избиране на изпълним файл"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -912,15 +913,15 @@ msgstr "Избиране на изпълним файл"
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Вмъкване"
 
@@ -928,13 +929,13 @@ msgstr "Вмъкване"
 msgid "Select All"
 msgstr "Избиране на всичко"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
@@ -942,11 +943,11 @@ msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -955,192 +956,193 @@ msgstr ""
 "Enlightenment·не успя да пусне програмата:<br><br>%s<br><br>Програмата не "
 "успя да се стартира."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Грешка при стартиране на програмата"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s е спряла неочаквано"
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Изходен код %i е върнат от·%s."
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s е прекъсната от сигнал Interrupt."
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s е прекъсната от сигнал Quit."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s е прекъсната от сигнал Abort."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s е прекъсната от Floating Point грешка."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s е прекъсната от сигнал Uninterruptable Kill."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s е прекъсната от сигнал Segmentation Fault."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s е прекъсната от сигнал Broken Pipe."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s е прекъсната от сигнал Termination."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s е прекъсната от грешка на шината."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s е прекъсната от сигнал с номер %i."
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Остатъкът от резултата е скрит. Запазете го за да го видите***\n"
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Дневник с грешки"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Няма съобщение с грешки"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Запазване на това съобщение"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Тези грешки ще бъдат записани като %s/%s.log"
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Информация за грешката"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Информация за сигналната грешка"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Резултат"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Няма резултат"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "Несъществуващ път"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s не съществува"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i файлове"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Режим за разглеждане"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Опресняване на изгледа"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Показване на скрити файлове"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Сортиране сега"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Нова директория"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Преименуване"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Характеристики"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Икони"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Списък"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Създаване на нова директория"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Име на новата директория:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Преименуване на %s до:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Преименуване на файл"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Потвърждаване за изтриването"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1194,7 +1196,7 @@ msgid "Owner can write"
 msgstr "Собственикът може да пише"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1227,49 +1229,49 @@ msgstr "Информация за връзката"
 msgid "Select an Image"
 msgstr "Избиране на изображение"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Непознат дял"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Сменяемо устройство"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Прост"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Вдълбано"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1283,27 +1285,27 @@ msgstr "Вдълбано"
 msgid "Appearance"
 msgstr "Изглед"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Автоматично плъзгане на съдържание"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Възможност за оразмеряване"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Започване редактирането на този инструмент"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Премахване"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Спиране редактирането на този инструмент"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1335,7 +1337,7 @@ msgstr ""
 "за<br>начален екран, която е правилна, или да поправите тази,<br>която "
 "ползвате в момента."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Забрани на прозорци"
 
@@ -1369,21 +1371,21 @@ msgid "Lock program changing:"
 msgstr "Забрана на програмата да промяна:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Позиция"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Ниво"
 
@@ -1392,12 +1394,12 @@ msgid "Iconified state"
 msgstr "Фаза на скриване"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Залепване"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Фаза на навиване"
 
@@ -1413,7 +1415,7 @@ msgstr "Фаза на цял екран"
 msgid "Lock me from changing:"
 msgstr "Забрана за мои промени:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Стил на рамка"
 
@@ -1433,126 +1435,126 @@ msgstr "Излизане от сесията докато е отворен то
 msgid "Remember these Locks"
 msgstr "Запомняне на тези забрани"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Винаги отгоре"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Винаги отдолу"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Вертикално уголемяване"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Хоризонтално уголемяване"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Връщане от уголемяване"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Рамка"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Изпращане до поле"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Забождане върху поле"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Отбождане от поле"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Фаза"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Пропускане"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Редактиране на икона"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Добавяне до менюто за предпочитания"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Добавяне на бърз клавиш"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Добавяне до стартер"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Създаване на икона"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Характеристики на прозореца"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Скриване"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Избиране стил на рамката"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Използване на икона, предоставена от E17"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Използване на икона, добита от програмата"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Използване на икона, дефинирана от потребителя"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Навиване"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Залепване"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Цял екран"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1561,6 +1563,11 @@ msgstr "Списък с прозорци"
 msgid "Pager"
 msgstr "Превключвател на полета"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Пропускане на Taskbar"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1573,7 +1580,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM характеристики"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Заглавие"
 
@@ -1669,11 +1676,11 @@ msgstr "NetWM  характеристики"
 msgid "Modal"
 msgstr "Модален"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Пропускане на Taskbar"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Пропускане в превключватела на полета"
 
@@ -1681,15 +1688,15 @@ msgstr "Пропускане в превключватела на полета"
 msgid "Hidden"
 msgstr "Скрит"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Характеристиките на прозореца не са уникални"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1703,11 +1710,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Няма сложени отговарящи характеристики"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1715,7 +1722,7 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1732,118 +1739,118 @@ msgid ""
 "affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Нищо"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Размер и позиция"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Забрани"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Размер, място и забрани"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Всичко"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Запомняне с"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Име и клас на прозореца"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Роля на прозорец"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Тип на прозореца"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Преходност"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Характеристики за запомняне"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Предпочитание на икона"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Виртуални полета"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Текущ екран"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Списък за пропускане на прозорци"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Съответствие само на този прозорец"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Стартиране на тази програма при влизане"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Файлов манипулатор"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "Рафт"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Настройки на модули"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Налични модули"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Зареждане на модул"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Заредени модули"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Изключване на модул"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1905,10 +1912,12 @@ msgstr "Предпочитани програми"
 msgid "Applications"
 msgstr "Програми"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Прозорци"
 
@@ -1934,52 +1943,52 @@ msgstr "Рафтове"
 msgid "Show/Hide All Windows"
 msgstr "Показване/скриване на всички прозорци"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Няма програми)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Конфигурация на виртуалните полета"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Заключване на екрана"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Режим \"Hibernate\""
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Изход"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Няма прозорци)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Изгубени прозорци"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Няма име!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Няма рафтове)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Рафт №"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Добавяне на рафт"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Изтриване на рафт"
 
@@ -1988,13 +1997,13 @@ msgid "Shelf Configuration"
 msgstr "Конфигурациране на рафта"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Дребен"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Малък"
 
@@ -2003,12 +2012,12 @@ msgid "Medium"
 msgstr "Среден размер"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Голям"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Грамаден"
 
@@ -2046,7 +2055,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f·пиксела"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Стилове"
 
@@ -2585,7 +2594,7 @@ msgstr "Настройване на рафтове"
 msgid "Almost Done"
 msgstr "Почти е готово"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2594,11 +2603,11 @@ msgstr ""
 "Имало е грешка при зареждане на модула %s<br>Не е бил намерен модул с име %"
 "s<br>в папките за търсене на модули<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Грешка при зареждане на модул"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2610,11 +2619,11 @@ msgstr ""
 "Съобщената грешка е:\n"
 "%s"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Модулът не съдържа всички нужни функции"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2622,12 +2631,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment·%s·Модул"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Искате ли да изключите този модул?<br>"
 
@@ -2918,9 +2927,9 @@ msgstr "Добавяне до предпочитаните"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Една директория нагоре"
 
@@ -2957,39 +2966,39 @@ msgstr "Забранен"
 msgid "Read-Write"
 msgstr "Четене и запис"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Конфигурация на модул Батерия"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Прости настройки"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Показване на предупреждение при изтощение на батерията"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Сложни настройки"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Проверка на батерията на всеки:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f·файлове"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Предупреждение когато батерията се изтощи до:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3000,71 +3009,51 @@ msgstr "Предупреждение когато батерията се изт
 msgid "%1.0f minutes"
 msgstr "%1.0f минути"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_main.c:137
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f·секунди"
+
+#: src/modules/battery/e_mod_main.c:129
 msgid "Battery"
 msgstr "Батерия"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
 msgstr ""
-"Слаба батерия<br> Батерията ви привършва.<br>Препоръчва се да преминете към "
-"друг електрически източник."
 
-#: src/modules/battery/e_mod_main.c:355
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
+#: src/modules/battery/e_mod_main.c:563
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "Негоден драйвер"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "ПЪЛНА"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Запълнена"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Слаба"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Опасност"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Зареждане"
-
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
-msgstr ""
-
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Часовник"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Конфигурация на Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Елементи"
 
@@ -3095,7 +3084,7 @@ msgid "Restart Applications"
 msgstr "Рестартиращи програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Всички Пограми"
 
@@ -3153,7 +3142,7 @@ msgstr "Групиране по"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3255,7 +3244,7 @@ msgid "Error Text"
 msgstr "Текст на грешките"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Заглавие на меню"
 
@@ -3264,7 +3253,7 @@ msgid "Menu Title Active"
 msgstr "Активирано заглавие на менюта"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Елемент от меню"
 
@@ -3273,12 +3262,12 @@ msgid "Menu Item Active"
 msgstr "Активиран елемент от меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Преместване на текст"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Текст на оразмеряване"
 
@@ -3291,12 +3280,12 @@ msgid "Winlist Label"
 msgstr "Надпис на списък с прозорци"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Заглаение на списък с прозорци"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Части на интерфейса"
 
@@ -3333,7 +3322,7 @@ msgid "List Item Odd Text"
 msgstr "Текст на нечетен елемент от лист"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Заглавие от лист"
 
@@ -3419,6 +3408,7 @@ msgstr "Име на полето"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Име:"
 
@@ -3460,10 +3450,10 @@ msgstr "Времето на бездействие е превишено"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Лични"
 
@@ -3795,12 +3785,12 @@ msgstr "Включване на композиране на екрана"
 msgid "Default Engine"
 msgstr "Възпройзвеждане по подразбиране"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Включване на композиране на екрана"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3924,192 +3914,197 @@ msgstr "Изравняване по ординатата"
 msgid "Run Command"
 msgstr "Стартиране на програма"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Главни"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Заглавна лента на прозорец"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Текстови блок (нормален)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Текстови блок (блед)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Текстови блок (голям)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Конфигурация на заглавие"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "За (Заглавие)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "За (Версия)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "За (Текст)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Заглавие (Заключване)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Лична Парола"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Диалог за грешка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Командно поле"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Заглавие (Начален екран)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Начален текст"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Начална версия"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Текстово поле"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Рамка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Етикет"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Бутони"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Плъзгач"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Радиобутони"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Бутони-отметки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Елемент от текстов лист"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Елемент от лист"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Файлов мениджър"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Буфер за писане"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Показване на икони вържу полето"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Малък (стилизиран)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Нормален (стилизиран)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Голям (стилизиран)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Настройки на шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Голям"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Много голям"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d·пиксели"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Включване на шрифтови класове"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Прост текст за преглед: 123 Текст!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Шрифтов клас"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Включване на шрифтов клас"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Заглаждане"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Шрифтове-резерви"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Име"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Включване на резерви"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Текст за преглед: Някакъв текст на кирилица"
 
@@ -4148,7 +4143,7 @@ msgid "New"
 msgstr "Нова"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Внасяне..."
 
@@ -4200,22 +4195,64 @@ msgstr "Език"
 msgid "Input Method Settings"
 msgstr "Настройка на входящите методи"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Настройки на избиране"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f·пиксела"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f·пиксела/сек"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f·сек"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Вграден(и)"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Настройки на езика"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Избор на езика"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Локалът е избран"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Локал"
 
@@ -4530,11 +4567,6 @@ msgstr "Използване на показалеца от X"
 msgid "Cursor Size"
 msgstr "Размер на показалеца"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f·пиксела"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Показалец"
@@ -4569,7 +4601,7 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Теми"
 
@@ -4726,11 +4758,6 @@ msgstr "Време докато предпазителя се активира"
 msgid "Time until X screensaver alternates"
 msgstr "Време докато предпазителя се смени"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f·секунди"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Скриване"
@@ -4787,23 +4814,23 @@ msgstr "Показване на начален екран"
 msgid "Startup"
 msgstr "Настройки при зареждане"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Избиране на теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Категории за теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Възлагане"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Изчистване на всичко"
 
@@ -4850,38 +4877,43 @@ msgstr "Смяна на фона"
 msgid "Transitions"
 msgstr "Преходни ефекти"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Настройки на тапетите"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Картина..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Градиент..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Каде да се сложи тапетът"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Всички полета"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Това поле"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Този екран"
 
@@ -4932,7 +4964,7 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 "Поради неизвестни причини, Enlightenment не бе могъл да създаде градиент"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Избиране на картина..."
 
@@ -4983,18 +5015,18 @@ msgid ""
 msgstr ""
 "Enlightenment·не успя да внесе картината<br>заради грешки в преобразуването."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Грешка при внасяне на тапета"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment не е могъл да внесе таоета <br>заради грешка в копирането."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5002,6 +5034,63 @@ msgstr ""
 "Enlightenment не е могъл да внесе тапета. <br>Сигурни ли сте, че е валиден "
 "тапет?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5293,6 +5382,62 @@ msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Автоматично преместване на прозорци при автоматично скриване на рафтовете"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Запомняне"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Настройване на запомняне"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "По подразбиране"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Име на икони"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Клас"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Клас"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Заглавие"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Заглавие"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Роля"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Без>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Настройки на списъка с прозорци"
@@ -5651,19 +5796,19 @@ msgstr "Показване на лентата с инструменти"
 msgid "Go to Parent Directory"
 msgstr "Една директория нагоре"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Отваряне"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Отваряне с ..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Специфични програми"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Стартиране на програма"
@@ -5957,7 +6102,7 @@ msgstr "Прелистване полето нагоре"
 msgid "Popup Desk Down"
 msgstr "Прелистване полето надолу"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Старт"
 
@@ -5965,111 +6110,111 @@ msgstr "Старт"
 msgid "Temperature Configuration"
 msgstr "Конфигурация на температурата"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Единици"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Целзий"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Фаренхайт"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Интервал за проверяване"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Бързо"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Бавно"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Много бавно"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Висока температура"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200·F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150·F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110·F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Ниска температура"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130·F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90·F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93·C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65·C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43·C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55·C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32·C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Сензори"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f·F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f·C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Температура"
 
@@ -6089,6 +6234,31 @@ msgstr "Назад"
 msgid "Choose Language"
 msgstr "Избор на език"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Слаба батерия<br> Батерията ви привършва.<br>Препоръчва се да преминете "
+#~ "към друг електрически източник."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "Негоден драйвер"
+
+#~ msgid "FULL"
+#~ msgstr "ПЪЛНА"
+
+#~ msgid "High"
+#~ msgstr "Запълнена"
+
+#~ msgid "Low"
+#~ msgstr "Слаба"
+
+#~ msgid "Danger"
+#~ msgstr "Опасност"
+
+#~ msgid "Charging"
+#~ msgstr "Зареждане"
+
 #~ msgid "NO INFO"
 #~ msgstr "Няма информация"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index b27c592..99424c4 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index f90656e..f5bd11c 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-09-03 21:00+0100\n"
 "Last-Translator: Marc Furtià i Puig <marc.furtia at gmail.com>\n"
 "Language-Team: \n"
@@ -14,8 +14,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -63,15 +63,15 @@ msgstr "Està segur que vol matar aquesta finestra ?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Si"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "No"
 
@@ -137,334 +137,334 @@ msgstr ""
 "Vostéš ha demanat Hibernar el seu Computador.<br><br> Està  segur que el vol "
 "suspendre a disc ?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Mou "
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Re-dimensiona"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menú de Finestra"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Augment"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Més petit"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Tanca"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Mata"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Finestra : Estat"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Mode enganxós"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Mode icònic "
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximitza Verticalment"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maximitza Horitzontalment"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximitza a Pantalla Completa"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Mode Maximització \"Smart\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Mode Maximització \"Expand\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Mode Maximització \"Fill\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Mode d'Ombrejat Amunt Toggle"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Mode d'Ombrejat Avall Toggle"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Mode d'Ombrejat a l'Esquerrat Toggle"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Mode d'Ombrejat a Dreta Toggle"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Estat Sense Tanca de la Vora"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Estat de la Tanca Clavada "
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Escriptori"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Salta a l'Escriptori de l'Esquerra"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Salta a l'Escriptori de la Dreta"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Salta a l'Escriptori de Dalt"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Salta a l'Escriptori de Baix"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Canvia d'Escriptori per..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Mostra l'Escriptori"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Canvia d'Escriptori a ..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Canvia d'Escriptori linealment ..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Canvia a l'Escriptori 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Canvia a l'Escriptori 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Canvia a l'Escriptori 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Canvia a l'Escriptori 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Canvia a l'Escriptori 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Canvia a l'Escriptori 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Canvia a l'Escriptori 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Canvia a l'Escriptori 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Canvia a l'Escriptori 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Canvia a l'Escriptori 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Canvia a l'Escriptori 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Canvia a l'Escriptori 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Canvia a l'Escriptori ...."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Salta a l'Escriptori de l'Esquerra"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Salta a l'Escriptori de la Dreta"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Salta a l'Escriptori de Dalt"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Salta a l'Escriptori de Baix"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Canvia d'Escriptori per..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Canvia d'Escriptori a ..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Canvia d'Escriptori linealment ..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Canvia a l'Escriptori 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Canvia a l'Escriptori 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Canvia a l'Escriptori 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Canvia a l'Escriptori 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Canvia a l'Escriptori 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Canvia a l'Escriptori 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Canvia a l'Escriptori 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Canvia a l'Escriptori 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Canvia a l'Escriptori 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Canvia a l'Escriptori 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Canvia a l'Escriptori 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Canvia a l'Escriptori 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Canvia a l'Escriptori ...."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -474,136 +474,136 @@ msgstr "Canvia a l'Escriptori ...."
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Envia el Ratolí A l'Escriptori 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Envia el Ratolí A l'Escriptori 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Envia el Ratolí a la Pantalla ...."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envia el Ratolí un Escriptori més enllà"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envia el Ratolí un Escriptori previ"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envia el Ratolí Endavant/Endarrera Pantalles"
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Finestra : Moviment"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Següent Escriptori"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Envia a la Pantalla prèvia"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "A l'Escriptori"
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Mostra el Menú Principal"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Mostra el Menú Favorits"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Mostra Totes les Aplicacions del Menú"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Mostra el Menú Clients"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Mostra Menú ..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Executa"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Definició de Comanda"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Aplicació"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Re-inicia "
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Surt immediatament"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Aturada"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Suspendre l'ordinador"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Suspendre a Disc l'ordinador"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Bloqueig de Pantalla"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Neteja Finestres"
 
@@ -612,12 +612,12 @@ msgstr "Neteja Finestres"
 msgid "Set As Background"
 msgstr "Fons de Pantalla"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Fitxer d'Escriptori "
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Fitxer d'Escriptori "
@@ -660,11 +660,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Escriptori %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Configuració Actualitzada"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -675,7 +675,7 @@ msgstr ""
 "configuració a disc <br> que no potser determinat.<br><br> El fitxer en el "
 "qual ha succeït l'error és <br>%s<br><br> Aquest fitxer serà  borrat"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -690,7 +690,7 @@ msgstr ""
 "configuració<br> pel seu directori arrel(home).<br><br>El fitxer en el que "
 "ha succeït l'error és :<br>%s<br><br>Aquest fitxer serà borrat <br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -703,7 +703,7 @@ msgstr ""
 "emplaçat.<br><br> El fitxer on ha succeït l'error és :<br>%s<br><br> Aquest "
 "fitxer ha estat borrat."
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -716,7 +716,7 @@ msgstr ""
 "espai.<br> El fitxer on hi ha l'error era:<br>%s<br><br>Aquest fitxer ha "
 "estat borrat.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -728,18 +728,17 @@ msgstr ""
 "succeït l'error és :<br> %s <br><br> Aquest fitxer ha estat borrat per dades "
 "incorrectes ."
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -748,19 +747,20 @@ msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "D'acord"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avançat"
 
@@ -776,14 +776,14 @@ msgstr "Aplica"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Mòduls"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Contenidor %d"
@@ -853,7 +853,7 @@ msgid "Desktop Entry Editor"
 msgstr "Editor de l'Entrada de Finestra"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icona"
@@ -889,7 +889,7 @@ msgstr "Nom Genèric"
 msgid "Window Class"
 msgstr "Classe de Finestra"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Categories"
@@ -936,6 +936,7 @@ msgstr "Seleccioneu una Icona"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Cancel·la "
 
@@ -943,7 +944,7 @@ msgstr "Cancel·la "
 msgid "Select an Executable"
 msgstr "Seleccioneu un Executable "
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -951,15 +952,15 @@ msgstr "Seleccioneu un Executable "
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Copia"
 
@@ -967,24 +968,24 @@ msgstr "Copia"
 msgid "Select All"
 msgstr "Selecciona-ho Tot"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Error al fer Córrer l'Aplicació"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -993,194 +994,194 @@ 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:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Error en l'Execució de l'Aplicació"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s ha parat d'executar-se inesperadament."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, 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:432
+#: src/bin/e_exec.c:437
 #, 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:434
+#: src/bin/e_exec.c:439
 #, 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:438
+#: src/bin/e_exec.c:443
 #, 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:441
+#: src/bin/e_exec.c:446
 #, 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:444
+#: src/bin/e_exec.c:449
 #, 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:447
+#: src/bin/e_exec.c:452
 #, 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:450
+#: src/bin/e_exec.c:455
 #, 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:453
+#: src/bin/e_exec.c:458
 #, 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:456
+#: src/bin/e_exec.c:461
 #, 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:459
+#: src/bin/e_exec.c:464
 #, 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:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Error en els Logs"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "No hi havia missatge d'error"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Desa Aquest Missatge"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Error d'Informació"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Error del senyal d'Informació"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Dades de sortida"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "No hi ha sortida"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i Fitxers"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode Bàsic"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Refresca la Vista"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Mostra els Fitxers Ocults"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Recorda l'Ordre"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Ordena Ara"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nou Directori"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Canvia el Nom"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Icones"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "Llistat de Finestres"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Creeu un nou Directori"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nom Nou del Directori:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Canvia el nom %s a : "
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Canvia el nom del Fitxer"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Confirmació de Borrar"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Està segur que vol borrar <br> <hilight> %s</hilight>?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1234,7 +1235,7 @@ msgid "Owner can write"
 msgstr "El Propietari pot escriure"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1267,49 +1268,49 @@ msgstr "Informació d'Enllaç "
 msgid "Select an Image"
 msgstr "Seleccioneu una Imatge"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Desconegut"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Dispositiu Extraïble"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Text Pla"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Sagnat"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1323,27 +1324,27 @@ msgstr "Sagnat"
 msgid "Appearance"
 msgstr "Aparença"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Mostra automàticament els continguts"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Autoritzat a ser re-dimensionat"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Inici de moviment/re-dimensió d'aquest Gadget"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Borra aquest Gadget"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Para de moure/re-dimensionar aquest gadget"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 #, fuzzy
 msgid ""
 "A previous instance of Enlightenment is still active\n"
@@ -1376,7 +1377,7 @@ msgstr ""
 "un<br> tema d'inici que sigui fet correctament o fixar el<br> que s'està  "
 "usant"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Bloqueig de Finestra"
 
@@ -1412,21 +1413,21 @@ msgid "Lock program changing:"
 msgstr "Bloqueja el programa que canvia:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Posició"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Mida"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Apilant"
 
@@ -1435,12 +1436,12 @@ msgid "Iconified state"
 msgstr "Estat iconificat"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Enganxositat"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Estat ombrejat"
 
@@ -1456,7 +1457,7 @@ msgstr "Pantalla completa"
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Estil de Vora"
 
@@ -1476,126 +1477,126 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr "Recorda aquesta aparença"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Sempre davant"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Sempre Darrera"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maximitza verticalment"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maximitza horitzontalment"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Des-maximitza "
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Recorda"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Vora"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Envia a la Pantalla"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Estat"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Edita Icona"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Afegeix a Aplicacions Favorites "
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Crea Icona"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propietats de Finestra"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Selecciona Estil de Vora"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Utilitza Icones Definits per L'usuari"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Llista de Finestres"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1604,6 +1605,10 @@ msgstr "Llista de Finestres"
 msgid "Pager"
 msgstr "Paginador"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr ""
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1616,7 +1621,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propietats d' ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Títol"
 
@@ -1712,11 +1717,11 @@ msgstr ""
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr ""
 
@@ -1724,15 +1729,15 @@ msgstr ""
 msgid "Hidden"
 msgstr "Ocult"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Recorda la Finestra"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Les propietats de la Finestra no són úniques"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1746,11 +1751,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1758,7 +1763,7 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1775,120 +1780,120 @@ msgid ""
 "affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Res"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Mida i Posició"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Mida, Posició i Presentació"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Tot"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Recorda usant"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nom de Finestra i Classe"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Paper de la Finestra"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Tipus de Finestra"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Propietats a Recordar"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Pantalla Virtual"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Ignora la llista de Finestres"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Arrenca aquest programa al iniciar"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configuració"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "Manegador de Fitxers "
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "Lleixa #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Configuració del Mòdul"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Mòduls  Autoritzats "
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Carregant Mòdul"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Mòduls Carregats "
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Mòduls Descarregats "
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1952,10 +1957,12 @@ msgstr "Aplicacions Preferents"
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Finestres"
 
@@ -1981,52 +1988,52 @@ msgstr "Lleixes"
 msgid "Show/Hide All Windows"
 msgstr "Mostra/Amaga Totes les Finestres"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Sense Aplicacions) "
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configura Escriptoris Virtuals "
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Bloqueja la Pantalla"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Hiberna"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Surt"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(No Ha Ha Finestres)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Finestres Perdudes"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "No hi ha Nom!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(No existeixen Lleixes"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Lleixa #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Afegeix una Lleixa"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Elimina la Lleixa"
 
@@ -2035,13 +2042,13 @@ msgid "Shelf Configuration"
 msgstr "Configuració de la Lleixa"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
@@ -2050,12 +2057,12 @@ msgid "Medium"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
@@ -2093,7 +2100,7 @@ msgid "%3.0f pixels"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr ""
 
@@ -2655,18 +2662,18 @@ msgstr "LLeixes Configurades"
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, 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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Error Carregant el Mòdul "
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2675,11 +2682,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Mòdul que no conté totes les funcions necessàries."
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2687,12 +2694,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Mòdul  %s de Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Està segur que vol descarregar aquest mòdul ?<br>"
 
@@ -2987,9 +2994,9 @@ msgstr "Afegeix a Aplicacions Preferents"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Puja un Directori"
 
@@ -3026,39 +3033,39 @@ msgstr "Oblidat"
 msgid "Read-Write"
 msgstr "Escriptura-Lectura"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configuració del Monitor de Bateria"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Configuracions Bàsiques"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Configuracions Avançades"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Xaqueja  la bateria cada "
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fitxers..."
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Avisa'm quan la bateria estigui per sota de :"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3069,70 +3076,52 @@ msgstr "Avisa'm quan la bateria estigui per sota de :"
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f percent"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Bateria"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr "La Bateria Està  Baixa.<br>S'hauria de connectar a la Corrent"
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "DRIVER DOLENT"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "PLE"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Alt"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Baix"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Perill"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Carregant"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Bateria"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Rellotge"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configuració de l'Enlightenment "
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3163,7 +3152,7 @@ msgid "Restart Applications"
 msgstr "Re-inicia Aplicacions"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Totes les Aplicacions"
 
@@ -3223,7 +3212,7 @@ msgstr "Agrupa per "
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3325,7 +3314,7 @@ msgid "Error Text"
 msgstr "Text d'Error"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Títol del Menú"
 
@@ -3334,7 +3323,7 @@ msgid "Menu Title Active"
 msgstr "Títol del Menú Actiu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr ""
 
@@ -3343,12 +3332,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Mou Text"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr ""
 
@@ -3361,12 +3350,12 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr ""
 
@@ -3403,7 +3392,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr ""
 
@@ -3489,6 +3478,7 @@ msgstr "Nom de l'Escriptori "
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nom:"
 
@@ -3530,10 +3520,10 @@ msgstr "Temps d'espera per bloqueig"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Personal"
 
@@ -3867,11 +3857,11 @@ msgstr ""
 msgid "Default Engine"
 msgstr "Defecte"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr ""
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3995,192 +3985,197 @@ msgstr "Alineament de l'eix de les Y"
 msgid "Run Command"
 msgstr "Executa Comanda"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Títol de la Barra"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Configuració de Capçalera "
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Sobre el Títol"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Sobre la Versió"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Sobre el Text"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Títol de Desbloqueig"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Contrasenya de Desbloqueig"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Error de Diàleg"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Títol de Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Text de Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Versió de Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Botons"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Botons de Radio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Botons de xequeig "
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Àrea de Text"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Llista Element"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Manegador de Fitxers "
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Mostra els icones d'Escriptori"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Configuració de Font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Tipus de Lletra"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -4219,7 +4214,7 @@ msgid "New"
 msgstr "Nou"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importa..."
 
@@ -4267,22 +4262,64 @@ msgstr "Llengua"
 msgid "Input Method Settings"
 msgstr "Paràmetres del Mètode d'Entrada"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Paràmetres de Configuració "
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%1.0f fitxers..."
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f segons"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Rotació:"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configuració de Llenguatge"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Selecció d'Idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Locals Seleccionades "
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Locals"
 
@@ -4598,11 +4635,6 @@ msgstr "Utilitza el Cursor de X "
 msgid "Cursor Size"
 msgstr "Mida del Cursor "
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr ""
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Cursor del Ratolí "
@@ -4637,7 +4669,7 @@ msgid "Images"
 msgstr "Imatges"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Temes"
 
@@ -4796,11 +4828,6 @@ msgstr "Temps restant per arrancar el salva pantalles "
 msgid "Time until X screensaver alternates"
 msgstr "Temps restant per canviar el salva pantalles"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr ""
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr ""
@@ -4857,23 +4884,23 @@ msgstr "Mostra la Pantalla d' Splash al entrar"
 msgid "Startup"
 msgstr "Arrancada"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Selector de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Categories de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Neteja-ho Tot"
 
@@ -4917,38 +4944,43 @@ msgstr "Canvia el Fons de Pantalla"
 msgid "Transitions"
 msgstr "Transaccions "
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Paràmetres de Fons de Pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Utilitza la Imatge del Tema "
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Imatge"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Tots els escriptoris "
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Aquest Escriptori"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Aquesta Pantalla"
 
@@ -4998,7 +5030,7 @@ msgstr ""
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Seleccioneu un Dibuix"
 
@@ -5048,22 +5080,79 @@ 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_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Error d'Importació de Fons d'Escriptori"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5353,6 +5442,62 @@ msgstr ""
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automàticament finestres de moviment/mida enlleixes d'auto-amagades "
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Recorda la Finestra"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Recorda"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Defecte"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nom d'Icona"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Títol"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Títol"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Fitxer"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "Cap"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr ""
@@ -5721,19 +5866,19 @@ msgstr ""
 msgid "Go to Parent Directory"
 msgstr "Pujar al Directori Pare"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Obre"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Obre amb ..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Aplicacions Específiques"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Executa Comanda"
@@ -6025,7 +6170,7 @@ msgstr "Salta a l'Escriptori de Dalt"
 msgid "Popup Desk Down"
 msgstr "Salta a l'Escriptori de Baix"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Inici"
 
@@ -6033,111 +6178,111 @@ msgstr "Inici"
 msgid "Temperature Configuration"
 msgstr "Configuració de Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Mostra Unitats"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius "
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Farenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Interval de Refresc"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Ràpid"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Lent"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Molt Lent"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Alta Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Baixa Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensors"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6160,6 +6305,29 @@ msgstr "Bàsic"
 msgid "Choose Language"
 msgstr "Llengua"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr "La Bateria Està  Baixa.<br>S'hauria de connectar a la Corrent"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "DRIVER DOLENT"
+
+#~ msgid "FULL"
+#~ msgstr "PLE"
+
+#~ msgid "High"
+#~ msgstr "Alt"
+
+#~ msgid "Low"
+#~ msgstr "Baix"
+
+#~ msgid "Danger"
+#~ msgstr "Perill"
+
+#~ msgid "Charging"
+#~ msgstr "Carregant"
+
 #~ msgid "NO INFO"
 #~ msgstr "NO INFORMACIÓ"
 
diff --git a/po/de.gmo b/po/de.gmo
index 71a573f..4f8e75f 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index aa7dc9a..6de78d1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,15 +2,15 @@
 # This file is put in the public domain.
 # vandango <vandango at toenda.com>, 2005, 2005/07/10
 # Azundris <edevel at azundris.com>, 2005/06/08.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2008-01-06 19:05+0100\n"
-"Last-Translator: Thomas Gstaedtner <thomas at gstaedtner.net>\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-03-25 01:48+0100\n"
+"Last-Translator: Thomas Gstädtner <thomas at gstaedtner.net>\n"
 "Language-Team: E17-de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,8 +20,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Ãœber Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -37,7 +37,7 @@ msgid ""
 "is not stable. Many features are incomplete or even non-existant yet and may "
 "have many bugs. You have been <hilight>WARNED!</hilight>"
 msgstr ""
-"Urheberrechtlich geschützt &copy; 1999-2007, durch das Enlightenment-"
+"Urheberrechtlich geschützt &copy; 1999-2007 durch das Enlightenment-"
 "Entwicklungs-Team.<br><br>Wir hoffen Ihnen gefällt das Benutzen dieser "
 "Software ebensogut wie uns das Schreiben gefiel.<br><br>Die Software wird so "
 "wie sie ist ohne explizite oder inbegriffene Garantie bereitgestellt. Sie "
@@ -69,15 +69,15 @@ msgstr "Möchten Sie dieses Fenster wirklich töten?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Ja"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Nein"
 
@@ -139,334 +139,334 @@ msgstr ""
 "Sie sind im Begriff den Computer in den Ruhezustand herunterzufahren."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Fenster : Aktionen"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Fenstermenü"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "nach oben"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "nach unten"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Schließen"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Töten"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
-msgstr "Fenster : Status"
+msgstr "Fenster : Zustand"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Klebrig-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Icon-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Vollbildmodus-Umschalter"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximiere vertikal"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
-msgstr "Maximiere hrizontal"
+msgstr "Maximiere horizontal"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximiere auf Vollbild"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
-msgstr "Maximierungsmodus \"Smart\""
+msgstr "Maximierungsmodus \"Geschickt\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
-msgstr "Maximieren-Modus \"ausklappen\""
+msgstr "Maximieren-Modus \"Erweitern\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximierungsmodus \"Füllen\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
-msgstr "Schattierungsmodus-Oben-Umschalter"
+msgstr "Einklappmodus-Oben-Umschalter"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
-msgstr "Schattierungsmodus-Unten-Umschalter"
+msgstr "Ausklappmodus-Unten-Umschalter"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
-msgstr "Schattierungsmodus-Links-Umschalter"
+msgstr "EInklappmodus-Links-Umschalter"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
-msgstr "Schattierungsmodus-Rechts-Umschalter"
+msgstr "Einklappmodus-Rechts-Umschalter"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
-msgstr "Schattierungsmodus-Umschalter"
+msgstr "Einklappmodus-Umschalter"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Schalte Rahmenloszustand um"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Schalte Befestigungszustand um"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Wechsle zu linker Arbeitsfläche"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
-msgstr "Klappe Arbeitsfläche nach oben"
+msgstr "Wechsle zu rechter Arbeitsfläche"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Wechsle zu oberer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
-msgstr "Klappe Arbeitsfläche nach unten"
+msgstr "Wechsle zu unterer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
-msgstr "Klappe Arbeitsfläche auf durch..."
+msgstr "Wechsle um Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Zeige die Arbeitsfläche"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
-msgstr "Klappe Arbeitsfläche auf zu..."
+msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
-msgstr "Klappe Arbeitsfläche linear auf..."
+msgstr "Wechsle linear zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Wechsle zu Arbeitsfläche 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Wechsle zu Arbeitsfläche 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Wechsle zu Arbeitsfläche 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Wechsle zu Arbeitsfläche 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Wechsle zu Arbeitsfläche 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Wechsle zu Arbeitsfläche 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Wechsle zu Arbeitsfläche 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Wechsle zu Arbeitsfläche 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Wechsle zu Arbeitsfläche 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Wechsle zu Arbeitsfläche 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Wechsle zu Arbeitsfläche 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Wechsle zu Arbeitsfläche 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Wechsle zu linker Arbeitsfläche"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Klappe Arbeitsfläche nach oben"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Wechsle zu oberer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Klappe Arbeitsfläche nach unten"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Klappe Arbeitsfläche auf durch..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Klappe Arbeitsfläche auf zu..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Klappe Arbeitsfläche linear auf..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -474,138 +474,138 @@ msgstr "Wechsle zu Arbeitsfläche..."
 #: src/modules/conf_screensaver/e_mod_main.c:34
 #: src/modules/ibox/e_mod_config.c:110
 msgid "Screen"
-msgstr "Anzeige"
+msgstr "Bildschirm"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Verschiebe Maus auf Bildschirm 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Verschiebe Maus auf Bildschirm 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Verschiebe Maus auf Bildschirm..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm weiter"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm zurück"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Verschiebe Maus Bildschirme weiter/zurück..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Fenster : Bewegen"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Zur nächsten Arbeitsfläche"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Zur vorhergehenden Arbeitsfläche"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Von Arbeitsfläche #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Zeige Hauptmenü"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Zeige Favoritenmenü"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Zeige Anwendungsmenü"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Zeige Fensterlistenmenü"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Zeige Menü..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Führe aus"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Bestimmter Befehl"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Anwendung"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Neustart"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Sofort beenden"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Herunterfahren"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Bereitschaftsmodus"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Ruhezustand"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Arbeitsflächensperre"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Fenster aufräumen"
 
@@ -613,12 +613,12 @@ msgstr "Fenster aufräumen"
 msgid "Set As Background"
 msgstr "Setzte als Hintergrund"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr ".desktop-Datei"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr ".desktop-Datei"
@@ -662,11 +662,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Arbeitsfläche %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Konfiguration erneuert"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -678,7 +678,7 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -694,7 +694,7 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -703,12 +703,12 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 "Während des schreibens der Enlightenment-Konfigurations-<br>dateien trat ein "
-"Ausgabefehler auf. Ihre festplatte<br>scheint nicht richtig zu funktionieren "
+"Ausgabefehler auf. Ihre Festplatte<br>scheint nicht richtig zu funktionieren "
 "und muss möglicherweise<br>ausgetauscht werden.<br><br>Folgende Datei war "
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -722,7 +722,7 @@ msgstr ""
 "Speicherplatz überschritten.<br><br>Folgende Datei war betroffen:<br>%"
 "s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu vermeiden.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -734,17 +734,17 @@ msgstr ""
 "war betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung "
 "zu vermeiden.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
+#, fuzzy
 msgid "Enlightenment Configuration Write Problems"
-msgstr "Probleme beim schreiben der Enlightenment Konfiguration"
+msgstr "Enlightenment Konfiguration Schreibprobleme"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -753,19 +753,20 @@ msgstr "Probleme beim schreiben der Enlightenment Konfiguration"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -781,14 +782,14 @@ msgstr "Ãœbernehmen"
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Module"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Container %d"
@@ -832,7 +833,7 @@ msgid ""
 "The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
 "happening. Please report this bug."
 msgstr ""
-"Beim Authentifizieren mittels PAM tragen Fehler bei<br>der "
+"Beim Authentifizieren mittels PAM traten Fehler bei<br>der "
 "Sitzungseinrichtung auf. Der Fehlercode lautet <hilight>%i</hilight>."
 "<br>Dies sollte nicht passieren; bitte melden Sie den Fehler."
 
@@ -860,7 +861,7 @@ msgid "Desktop Entry Editor"
 msgstr "Programmeintragseditor"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icon"
@@ -896,7 +897,7 @@ msgstr "Generischer Name"
 msgid "Window Class"
 msgstr "Fensterklasse"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Kategorien"
@@ -933,7 +934,7 @@ msgstr "Dateiname"
 
 #: src/bin/e_eap_editor.c:556
 msgid "Select an Icon"
-msgstr "Wähle ein Icon"
+msgstr "Wählen Sie ein Icon"
 
 #: src/bin/e_eap_editor.c:598 src/bin/e_eap_editor.c:662
 #: src/bin/e_entry_dialog.c:59 src/bin/e_fm_prop.c:514
@@ -943,15 +944,15 @@ msgstr "Wähle ein Icon"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/bin/e_eap_editor.c:625
-#, fuzzy
 msgid "Select an Executable"
-msgstr "Wähle ein Bild aus"
+msgstr "Wählen Sie eine ausführbare Datei aus"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -959,15 +960,15 @@ msgstr "Wähle ein Bild aus"
 msgid "Delete"
 msgstr "Entfernen"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -975,24 +976,24 @@ msgstr "Einfügen"
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Laufzeitfehler"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Anwendungslaufzeitfehler"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1001,195 +1002,195 @@ msgstr ""
 "Enlightenment konnte die Anwendung nicht ausführen:<br><br>%s<br><br>Der "
 "Anwendungsstart schlug fehl."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Fehler beim Ausführen der Anwendung"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s wurde unerwartet beendet."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, 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:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s wurde durch ein Unterbrechungssignal unterbrochen."
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr "%s wurde durch ein Ende-Signal unterbrochen."
+msgstr "%s wurde durch ein Endesignal unterbrochen."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s wurde durch ein Abbruchsignal unterbrochen."
+msgstr "%s wurde durch ein Abbruchssignal unterbrochen."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s wurde durch einen Fließkommafehler unterbrochen."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, 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:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s wurde durch einen Segmentierungsfehler unterbrochen."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s wurde durch eine defekte Weiterleitung unterbrochen."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s wurde durch ein Terminierungssignal unterbrochen."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s wurde durch einen Bus-Fehler unterbrochen."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s wurde durch das Signal %i unterbrochen."
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Die verbleibende Ausgabe wurde ausgeblendet. Speichere die Ausgabe zum "
 "betrachten.***\n"
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Fehlerprotokolle"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Es gab keine Fehlermeldung."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Speichere diese Nachricht"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Fehlerinformation"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Fehlersignalinformation"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Ausgabedaten"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Es gab keine Ausgabe."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "Nicht vorhandener Pfad"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s existiert nicht"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i Dateien"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
-#, fuzzy
 msgid "View Mode"
-msgstr "Einfacher Modus"
+msgstr "Ansicht"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Aktualisiere die Anzeige"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Zeige versteckte Dateien"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "An Anordnung erinnern"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Jetzt sortieren"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Neues Verzeichnis"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Icons"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
-msgstr "dNeues Verzeichnis erstellen"
+msgstr "Neues Verzeichnis erstellen"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Neuer Verzeichnisname:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Umbenennen von %s in:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Benenne Datei um"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Löschung bestätigen"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1243,7 +1244,7 @@ msgid "Owner can write"
 msgstr "Besitzer kann schreiben"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1276,49 +1277,49 @@ msgstr "Verknüpfungsinformation"
 msgid "Select an Image"
 msgstr "Wähle ein Bild aus"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Unbekannt"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Entfernbare Geräte"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Flach"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Eingedrückt"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1332,27 +1333,27 @@ msgstr "Eingedrückt"
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Verschiebe Inhalte automatisch"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Ermögliche Größenänderung"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Starte Verschieben/Größenänderung dieses Helfers"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Entferne diesen Helfer"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Beende Verschieben/Größenänderung dieses Helfers"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1372,7 +1373,7 @@ msgstr "Diesen Startbildschirm in Zukunft nicht mehr anzeigen?"
 
 #: src/bin/e_init.c:558
 msgid "Theme Bug Detected"
-msgstr "Fehler im Theman entdeckt"
+msgstr "Fehler im Thema entdeckt"
 
 #: src/bin/e_init.c:559
 msgid ""
@@ -1385,7 +1386,7 @@ msgstr ""
 "<br>Sie sollten ein funktionierendes Thema verwenden<br>oder den Fehler im "
 "aktuell verwendeten beheben."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Fenstersperren"
 
@@ -1409,7 +1410,7 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:292
 msgid "Do not allow the border to change on this window"
-msgstr "Erlaube dem Fenster keinen Randwechsel"
+msgstr "Erlaube dem Fenster keinen Rahmenwechsel"
 
 #: src/bin/e_int_border_locks.c:295
 msgid "Remember these Locks for this window next time it appears"
@@ -1420,21 +1421,21 @@ msgid "Lock program changing:"
 msgstr "Verweigere dem Programm folgende Änderungen:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Größe"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Ablage"
 
@@ -1443,18 +1444,18 @@ msgid "Iconified state"
 msgstr "Minimierter Zustand"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Klebrigkeit"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Eingeklappt"
 
 #: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
 msgid "Maximized state"
-msgstr "Maximiert"
+msgstr "Maximierter Zustand"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
 msgid "Fullscreen state"
@@ -1464,7 +1465,7 @@ msgstr "Vollbildmodus"
 msgid "Lock me from changing:"
 msgstr "Verhindere manuelle Änderung von:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Rahmenart"
 
@@ -1484,126 +1485,126 @@ msgstr "Abmelden solange dieses Fenster geöffnet ist"
 msgid "Remember these Locks"
 msgstr "Diese Sperren merken"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Immer im Vordergrund"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Immer im Hintergrund"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Vertikal maximieren"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Horizontal maximieren"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
-msgstr "Wiederherstellen"
+msgstr "Maxmimierung aufheben"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Erinnern"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Fensterrahmen"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Verschiebe auf Arbeitsfläche"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Befestige auf Arbeitsfläche"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Löse von Arbeitsfläche"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Status"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
-msgstr ""
+msgstr "Ãœberspringen"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Icon bearbeiten"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Zum Favoritenmenü hinzufügen"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Zum Schnellstartmenü hinzufügen"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Icon erstellen"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Fenstereigenschaften"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Minimieren"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
-msgstr "Wähle Rahmenstil"
+msgstr "Wähle Rahmenart"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
-msgstr "Benutze E17 Standard Symbolvoreinstellung"
+msgstr "Benutze E17 Standardsymbolvoreinstellung"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
-msgstr "Bevorzuge Anwendungsspezifisches Icon"
+msgstr "Verwende Anwendungsspezifisches Icon"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
-msgstr "Bevorzuge Benutzerspezifisches Icon"
+msgstr "Verwende Benutzerspezifisches Icon"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Eingeklappt"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Klebrig"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Fensterliste"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1612,6 +1613,11 @@ msgstr "Fensterliste"
 msgid "Pager"
 msgstr "Arbeitsflächenumschalter"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Fensterliste überspringen"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1624,7 +1630,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Eigenschaften"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Titel"
 
@@ -1677,9 +1683,8 @@ msgid "Window Group"
 msgstr "Fenstergruppe"
 
 #: src/bin/e_int_border_prop.c:436
-#, fuzzy
 msgid "Transient For"
-msgstr "Flüchtig für"
+msgstr "Vergänglich für"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
@@ -1707,7 +1712,7 @@ msgstr "Wichtig"
 
 #: src/bin/e_int_border_prop.c:444
 msgid "Request Delete"
-msgstr "Fordere Entfernung an"
+msgstr "Entfernung anfordern"
 
 #: src/bin/e_int_border_prop.c:445
 msgid "Request Position"
@@ -1721,11 +1726,11 @@ msgstr "NetWM Eigenschaften"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
-msgstr "Ãœberspringe Fensterliste"
+msgstr "Fensterliste überspringen"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Arbeitsflächenumschalter überspringen"
 
@@ -1733,15 +1738,15 @@ msgstr "Arbeitsflächenumschalter überspringen"
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
-msgstr "Fenstereigenschaften Merken"
+msgstr "Fenstereigenschaften merken"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Eigenschaften treffen auf mehrere Fenster zu"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1755,21 +1760,21 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 "Sie wollen, dass Enlightenment sich verschiedene Eigenschaften<br>eines "
-"Fensters zu merken, welches<br><hilight>keine einzigartigen Eigenschaften "
+"Fensters merkt, welches<br><hilight>keine einzigartigen Eigenschaften "
 "besitzt</hilight>.<br><br>Das bedeutet, dass sich Enlightenment<br>bestimmte "
 "Eigenschaften für mehrere verschiedene Fenster<br>merkt, die teilweise "
 "dieselben Eigenschaften besitzen.<br><br>Dies ist nur eine Warnung, falls "
 "Sie dies nicht beabsichtigten.<br>Sollten Sie es beabsichtigten drücken Sie "
 "einfach<br>die <hilight>Annehmen</hilight>- oder <hilight>OK</hilight>-"
-"Schaltflächen<br>wodurch die Einstellungen gespeichert werden.<br>Drücken "
-"Sie <hilight>Abbrechen</hilight> wenn Sie sich nicht sicher sind,<br>wodurch "
-"die Änderungen verworfen werden."
+"Schaltfläche<br>wodurch die Einstellungen gespeichert werden.<br>Drücken Sie "
+"<hilight>Abbrechen</hilight> wenn Sie sich nicht sicher sind,<br>wodurch die "
+"Änderungen verworfen werden."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Keine passenden Eigenschaften ausgewählt"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1780,7 +1785,7 @@ msgstr ""
 "ohne festzulegen <hilight>wie</hilight>es sich diese merken soll.<br><br>Sie "
 "müssen zumindest eine Möglichkeit wählen."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1797,7 +1802,7 @@ msgid ""
 "affected."
 msgstr ""
 "Sie wollen, dass Enlightenment sich verschiedene Eigenschaften<br>eines "
-"Fensters zu merken, welches<br><hilight>keine einzigartigen Eigenschaften "
+"Fensters merkt, welches<br><hilight>keine einzigartigen Eigenschaften "
 "besitzt</hilight>.<br><br>Das bedeutet, dass sich Enlightenment<br>bestimmte "
 "Eigenschaften für mehrere verschiedene Fenster<br>merkt, die teilweise "
 "dieselben Eigenschaften besitzen.<br><br>Möglicherweise möchten Sie "
@@ -1805,123 +1810,122 @@ msgstr ""
 "wenn Sie nur eine Instanz dieses Fensters ändern möchten.<br><br>Dies ist "
 "nur eine Warnung, falls Sie dies nicht beabsichtigten.<br>Sollten Sie es "
 "beabsichtigten drücken Sie einfach<br>die <hilight>Annehmen</hilight>- oder "
-"<hilight>OK</hilight>-Schaltflächen<br>wodurch die Einstellungen gespeichert "
+"<hilight>OK</hilight>-Schaltfläche<br>wodurch die Einstellungen gespeichert "
 "werden.<br>Drücken Sie <hilight>Abbrechen</hilight> wenn Sie sich nicht "
 "sicher sind,<br>wodurch die Änderungen verworfen werden."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nichts"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Größe und Position"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Sperren"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Größe, Position und Sperren"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Alles"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
-msgstr "Merken anhand"
+msgstr "Merken an Hand"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Fensternamen und -klasse"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Funktion des Fensters"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Fenstertyp"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Vergänglichkeit"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Zu merkende Eigenschaften"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Icon-Eigenschaften"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Aktueller Bildschirm"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
-msgstr "Fensterliste Ãœberspringen"
+msgstr "Fensterliste überspringen"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Nur auf dieses Fenster zutreffend"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Starte dieses Programm beim Anmelden"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Datei-Manager"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "Modulablage"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Modul-Einstellungen"
 
-#: src/bin/e_int_config_modules.c:167
-#, fuzzy
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
-msgstr "Verfügbare Helfer"
+msgstr "Verfügbare Module"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Lade Modul"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Geladene Module"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Entlade Module"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1973,8 +1977,8 @@ msgid ""
 "configuration's<br>executable is in your PATH<br>"
 msgstr ""
 "Fehler beim Starten des Eingabemethodenprogramms.<br><br>Bitte stellen Sie "
-"sicher, dass die Eingabemethoden-<br>konfiguration korrekt ist und dass Ihr "
-"Konfigurationsprogramm<br>in PATH befindet.<br>"
+"sicher, dass die Eingabemethoden-<br>konfiguration korrekt ist und dass sich "
+"Ihr Konfigurationsprogramm<br>in PATH befindet.<br>"
 
 #: src/bin/e_int_menus.c:90
 msgid "Main"
@@ -1988,10 +1992,12 @@ msgstr "Bevorzugte Anwendungen"
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2017,52 +2023,52 @@ msgstr "Modulablagen"
 msgid "Show/Hide All Windows"
 msgstr "Alle Fenster zeigen/verstecken"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Keine Anwendung)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Arbeitsflächen konfigurieren"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Bildschirm sperren"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Ruhezustand"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Abmelden"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Keine Fenster)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Verlorene Fenster"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Kein Name!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Keine Modulablagen)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Modulablage #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Modulablage hinzufügen"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Modulablage entfernen"
 
@@ -2071,13 +2077,13 @@ msgid "Shelf Configuration"
 msgstr "Modulablagenkonfiguration"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
-msgstr "Klein"
+msgstr "Winzig"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Klein"
 
@@ -2086,12 +2092,12 @@ msgid "Medium"
 msgstr "Mittel"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Groß"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Riesig"
 
@@ -2129,9 +2135,9 @@ msgid "%3.0f pixels"
 msgstr "%3.0f Pixel"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
-msgstr "Stil"
+msgstr "Stile"
 
 #: src/bin/e_int_shelf_config.c:643
 msgid "Auto Hide"
@@ -2229,24 +2235,24 @@ msgid ""
 msgstr ""
 "Optionen:\n"
 "\t-display DISPLAY\n"
-"The current display server does not \n"
-"have the DPMS extension.\t\tMit Bildschirm DISPLAY verbinden.\n"
-"\t\tEG: -display :1.0<br>\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tEinen FALSCHEN Xinerama-Bildschirm (anstatt eines echten)\n"
-"\t\tmit festgelegter Geometrie hinzufügen. Fügen Sie so viele wie\n"
-"\t\tgewünscht hinzu; jeder ersetzt einen echten Xinerama-Bildschirm\n"
-"\t\t(soweit vorhanden).\n"
-"\t\tSo können Sie u.a. Xinerama simulieren.\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\tVerwende das Konfigurationsprofil CONF_PROFILE anstatt des vom Benutzer "
-"gewählten Standards.\n"
-"\t-Gut\n"
-"\t\tSei gut.\n"
-"\t-Böse\n"
+"\t\tVerwende das Konfigurationsprofil CONF_PROFILE anstatt des "
+"Benutzerdefinierten oder einfach \"Standard\".\n"
+"\t-good\n"
+"\t\tSei brav.\n"
+"\t-evil\n"
 "\t\tSei böse.\n"
-"\t-Psychotisch\n"
+"\t-psychotic\n"
 "\t\tSei psychotisch.\n"
 
 #: src/bin/e_main.c:312
@@ -2254,8 +2260,8 @@ msgid ""
 "Enlightenment cannot Initialize Ecore!\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment kann das ECore-Subsystem nicht\n"
-"initialisieren! Ist der Arbeitsspeicher voll?"
+"Enlightenment kann das Ecore-Subsystem nicht initialisieren!\n"
+"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:336
 msgid ""
@@ -2263,7 +2269,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann das Dateisubsystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
+"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:348
 msgid ""
@@ -2271,7 +2277,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann den Exit-Signalhandler nicht initialisieren.\n"
-"Vielleicht haben sie nicht genügend freien Arbeitsspeicher?"
+"Vielleicht haben sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:354
 msgid ""
@@ -2279,7 +2285,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann den HUP-Signalhandler nicht initialisieren.\n"
-"Vielleicht haben sie nicht genügend freien Arbeitsspeicher?"
+"Vielleicht haben sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:366
 msgid ""
@@ -2287,7 +2293,7 @@ msgid ""
 "Have you set your DISPLAY variable?"
 msgstr ""
 "Enlightenment kann die Verbindung mit dem X-Server nicht initialisieren.\n"
-"Haben Sie ihre DISPLAY-Variable gesetzt?"
+"Haben Sie die DISPLAY-Variable gesetzt?"
 
 #: src/bin/e_main.c:374
 msgid ""
@@ -2303,7 +2309,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann das Verbindungssystem nicht initialisieren.\n"
-"Vielleicht haben sie nicht genügend freien Speicherplatz?"
+"Vielleicht haben sie nicht genug freien Speicherplatz?"
 
 #: src/bin/e_main.c:405
 msgid ""
@@ -2311,7 +2317,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann das IPC-Subsystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
+"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:414
 msgid ""
@@ -2326,8 +2332,8 @@ msgid ""
 "Enlightenment cannot initialize the Evas system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment kann das Evas System nicht initialisieren.<br>Vielleicht haben "
-"Sie nicht genügend freien Arbeitsspeicher?"
+"Enlightenment kann das Evas System nicht initialisieren.\n"
+"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:442
 msgid ""
@@ -2336,7 +2342,7 @@ msgid ""
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 "Enlightenment entdeckte, dass ecore_evas das X11-Software-\n"
-"rendering in Evas nicht unterstützt. Bitte überprüfen Sie ihre Evas-\n"
+"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:449
@@ -2356,7 +2362,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment kann das FDO-Arbeitsflächen-Subsystem nicht initialisieren.\n"
-"Vielleicht haben Sie nicht genügend freien Arbeitsspeicher?"
+"Vielleicht haben Sie nicht genug freien Arbeitsspeicher?"
 
 #: src/bin/e_main.c:483
 msgid ""
@@ -2449,8 +2455,9 @@ msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kann sein intl-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:631
+#, fuzzy
 msgid "Setting up Paths"
-msgstr ""
+msgstr "Nicht vorhandener Pfad"
 
 #: src/bin/e_main.c:648
 #, fuzzy
@@ -2490,8 +2497,9 @@ msgstr ""
 "Enlightenment kann sein Tastenbelegungs-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:686
+#, fuzzy
 msgid "Setup Popups"
-msgstr ""
+msgstr "Arbeitsflächenwechsel mit der Maus"
 
 #: src/bin/e_main.c:691
 msgid "Enlightenment cannot set up its popup system."
@@ -2517,12 +2525,13 @@ msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Enlightenment konnte sich für keinen Ihrer Bildschirme als Window Manager\n"
-"etablieren. Vielleicht läuft schon ein anderer Window Manager?\n"
+"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:715
+#, fuzzy
 msgid "Setup Execution System"
-msgstr ""
+msgstr "Autostartanwendungen"
 
 #: src/bin/e_main.c:720
 msgid "Enlightenment cannot set up its exec system."
@@ -2538,8 +2547,9 @@ msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kann die \"Merken\"-Einstellungen nicht initialisieren."
 
 #: src/bin/e_main.c:737
+#, fuzzy
 msgid "Setup FM"
-msgstr ""
+msgstr "Arbeitsflächenwechsel mit der Maus"
 
 #: src/bin/e_main.c:742
 msgid "Enlightenment cannot initialize the File manager.\n"
@@ -2554,8 +2564,9 @@ msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kann sein msg-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:764
+#, fuzzy
 msgid "Setup DND"
-msgstr ""
+msgstr "Verschiebe auf Arbeitsfläche"
 
 #: src/bin/e_main.c:769
 msgid "Enlightenment cannot set up its dnd system."
@@ -2608,8 +2619,9 @@ msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:819
+#, fuzzy
 msgid "Setup DPMS"
-msgstr ""
+msgstr "Arbeitsflächenwechsel mit der Maus"
 
 #: src/bin/e_main.c:824
 msgid "Enlightenment cannot configure the DPMS settings."
@@ -2703,7 +2715,7 @@ msgstr "Konfigurierte Modulablagen"
 msgid "Almost Done"
 msgstr "Fast fertig"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2712,11 +2724,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Fehler beim Laden des Moduls"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2725,11 +2737,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Das Modul enthält nicht alle benötigten Funktionen."
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2737,15 +2749,14 @@ msgid ""
 "%i.<br>"
 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>Laden des "
-"Moduls abgebrochen."
+"benötigt.<br>Die  Enlightenment bekannte Modul-API ist %i.<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Möchten Sie dieses Modul abschalten?<br>"
 
@@ -2776,8 +2787,9 @@ msgid "Delete this Shelf"
 msgstr "Lösche diese Modulablage"
 
 #: src/bin/e_startup.c:62
+#, fuzzy
 msgid "Starting"
-msgstr "Starte"
+msgstr "Starte %s"
 
 #: src/bin/e_sys.c:128
 msgid "Checking System Permissions"
@@ -3031,13 +3043,12 @@ msgstr "Entfernen"
 #: src/bin/e_widget_config_list.c:73
 #: src/modules/conf_applications/e_int_config_apps.c:260
 msgid "Up"
-msgstr ""
+msgstr "Nach oben"
 
 #: src/bin/e_widget_config_list.c:79
 #: src/modules/conf_applications/e_int_config_apps.c:265
-#, fuzzy
 msgid "Down"
-msgstr "Herunterfahren"
+msgstr "Nach unten"
 
 #: src/bin/e_widget_fsel.c:288
 msgid "Add to Favorites"
@@ -3047,9 +3058,9 @@ msgstr "Zu den Favoriten hinzufügen"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Ein Verzeichnis nach oben"
 
@@ -3086,39 +3097,39 @@ msgstr "Verboten"
 msgid "Read-Write"
 msgstr "Lesen-Schreiben"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Konfiguration der Batterieanzeige"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Einfache Einstellungen"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Benachrichtigung bei niedrigem Akkustand"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Überprüfe Akku alle "
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f Dateien"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Benachrichtigen wenn Akku bei "
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3129,72 +3140,54 @@ msgstr "Benachrichtigen wenn Akku bei "
 msgid "%1.0f minutes"
 msgstr "%1.0f Minute(n)"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f Prozent"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Batterie"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr "Ihr Akku ist bald leer.<br>Sie sollten auf Netzstrom wechseln."
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "FALSCHER TREIBER"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "VOLL"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Hoch"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Niedrig"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Gefahr"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f Sekunden"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Laden"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Uhr"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment-Konfiguration"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
-msgstr ""
+msgstr "Objekte"
 
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/conf/e_mod_main.c:116
@@ -3223,7 +3216,7 @@ msgid "Restart Applications"
 msgstr "Neustartanwendungen"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Alle Anwendungen"
 
@@ -3240,13 +3233,12 @@ msgstr "Neue Anwendung"
 #: src/modules/conf_borders/e_mod_main.c:36
 #: src/modules/conf_desk/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:30
-#, fuzzy
 msgid "Internal"
-msgstr "Interlingua"
+msgstr "Intern"
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
-msgstr ""
+msgstr "IBar Andere"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
@@ -3282,7 +3274,7 @@ msgstr "Gruppiere nach"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3384,7 +3376,7 @@ msgid "Error Text"
 msgstr "Fehlertext"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Menütitel"
 
@@ -3393,7 +3385,7 @@ msgid "Menu Title Active"
 msgstr "Menütitel aktiv"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Menügegenstand"
 
@@ -3402,12 +3394,12 @@ msgid "Menu Item Active"
 msgstr "Menügegenstand aktiv"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Verschieben Text"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Verändere Textgröße"
 
@@ -3420,12 +3412,12 @@ msgid "Winlist Label"
 msgstr "Fensterlistenbeschriftung"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Winlist-Titel"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Grafikobjekte"
 
@@ -3462,7 +3454,7 @@ msgid "List Item Odd Text"
 msgstr "Listengegenstand übriger Text"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Listenüberschrift"
 
@@ -3548,6 +3540,7 @@ msgstr "Arbeitsflächenname"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Name:"
 
@@ -3563,7 +3556,6 @@ msgid "Configure"
 msgstr "Konfiguriere"
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
 msgstr "Arbeitsfläche"
 
@@ -3590,10 +3582,10 @@ msgstr "Leerlaufzeit läuft ab in"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -3929,12 +3921,12 @@ msgstr "Aktiviere Composite-Manager"
 msgid "Default Engine"
 msgstr "Standard-Engine"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Aktiviere Composite-Manager"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3942,9 +3934,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_engine/e_mod_main.c:35
-#, fuzzy
 msgid "Engine"
-msgstr "Englisch"
+msgstr "Engine"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:46
 msgid "Run Command Settings"
@@ -4059,192 +4050,197 @@ msgstr "Y-Achsen-Anpassung"
 msgid "Run Command"
 msgstr "Befehl ausführen ..."
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Basis"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Titelleiste"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "schlichter Textblock"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "leichter Textblock"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "großer Textblock"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Ãœberschrift konfigurieren"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Ãœber-Titel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Ãœber die Version"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Ãœber-Text"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Titel der Arbeitsflächensperre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Passwort der Arbeitsflächensperre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Fehlerdialog"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Befehl ausführen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Startbildschirmtitel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Text des Startbildschirms"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Version des Startbildschirms"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Eintrag"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Rahmen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Beschriftung"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Schaltflächen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Schieber"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Auswahlfelder"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Kontrollschaltflächen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Textlistengegenstand"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Listengegenstand"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Datei-Manager"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Zeige Arbeitsflächenicons"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Klein aussehend"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Normal aussehend"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Groß aussehend"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Schriftarteneinstellungen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Groß"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Wirklich groß"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d Pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Aktiviere benutzerdefinierte Schriftklassen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Standardvorschautext: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Schriftklasse"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Aktiviere Schriftklasse"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Ersatzschriftart"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Ersatznamen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Aktiviere Ersatzobjekte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Erweiterter Vorschautext.. 我真的会写中文"
 
@@ -4283,7 +4279,7 @@ msgid "New"
 msgstr "Neu"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importiere..."
 
@@ -4335,22 +4331,64 @@ msgstr "Sprache"
 msgid "Input Method Settings"
 msgstr "Eingabemethodeneinstellungen"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Auswahleinstellungen"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f Pixel"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f Pixel/Sek"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f sek"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interlingua"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Sprachkonfiguration"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Sprachauswahl"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Ausgewählter Zeichensatz"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Zeichensatz"
 
@@ -4669,11 +4707,6 @@ msgstr "Verwende X-Mauszeiger"
 msgid "Cursor Size"
 msgstr "Zeigergröße"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f Pixel"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Mauszeiger"
@@ -4708,7 +4741,7 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Erscheinungsbild"
 
@@ -4804,9 +4837,8 @@ msgid "Performance"
 msgstr "Leistung"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:53
-#, fuzzy
 msgid "Profile Selector"
-msgstr "Themenwähler"
+msgstr "Profilauswahl"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:82
 msgid "Available Profiles"
@@ -4826,13 +4858,12 @@ msgstr ""
 "entfernen möchten?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:215
-#, fuzzy
 msgid "Are you sure you want to delete this profile?"
-msgstr "Möchten Sie diese Modulablage wirklich entfernen?"
+msgstr "Sind Sie sicher, dass sie dieses Profil löschen möchten?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:262
 msgid "Add New Profile"
-msgstr ""
+msgstr "Füge neues Profil hinzu"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:276
 msgid "Plain Profile"
@@ -4843,9 +4874,8 @@ msgid "Clone Current Profile"
 msgstr "Kopiere aktuelles Profil"
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "Eigenschaften"
+msgstr "Profile"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:49
 msgid "Screen Saver Settings"
@@ -4870,11 +4900,6 @@ msgstr "Zeit bis zum Start des Bildschirmschoners"
 msgid "Time until X screensaver alternates"
 msgstr "Zeit bis zum Wechsel des Bildschirmschoners"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f Sekunden"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Abschalten"
@@ -4931,23 +4956,23 @@ msgstr "Zeige Startbildschirm beim Anmelden"
 msgid "Startup"
 msgstr "Start"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Themenwähler"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Themenkategorien"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Zuweisen"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Alle leeren"
 
@@ -4995,38 +5020,43 @@ msgstr "Hintergrundwechsel"
 msgid "Transitions"
 msgstr "Übergänge"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Hintergrundeinstellungen"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Verwende Themenhintergrundbild"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Bild..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Farbverlauf..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Verwende dieses Hintergrundbild auf..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "...allen Arbeitsflächen"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "...dieser Arbeitsfläche"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "...diesem Bildschirm"
 
@@ -5077,7 +5107,7 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 "Aus irgendeinem Grund konnte Enlightenment keinen Gradienten erstellen."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Wähle ein Bild aus..."
 
@@ -5128,19 +5158,19 @@ msgid ""
 msgstr ""
 "Enlightenment konnte das Bild wegen<br>Umwandlungsfehlern nicht importieren."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Hintergrundbild-Importfehler"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5148,6 +5178,63 @@ msgstr ""
 "Enlightenment konnte das Hintergrundbild nicht importieren<br><br>Sind Sie "
 "sicher, dass dies ein gültiges Hintergrundbild ist?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5439,6 +5526,62 @@ msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Verschiebe/Verändere Fenster beim Ausblenden der Modulablage automatisch"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Fenstereigenschaften merken"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Erinnern"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Standards"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Icon-Name"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Klasse"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Klasse"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Titel"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Titel"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Rolle"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Nichts>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Fensterlisten-Einstellungen"
@@ -5514,7 +5657,7 @@ msgstr "CpuFreq"
 #: src/modules/cpufreq/e_mod_main.c:177
 #, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Sehr schnell (1 sek)"
+msgstr "Sehr schnell (0,5s)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
 #, fuzzy
@@ -5740,62 +5883,56 @@ msgstr ""
 "Unannehmlichkeiten.<br>"
 
 #: src/modules/fileman/e_mod_main.c:343
-#, fuzzy
 msgid "Fileman Configuration Updated"
-msgstr "Konfiguration erneuert"
+msgstr "Dateimanagerkonfiguration aktualisiert"
 
 #: src/modules/fileman/e_mod_config.c:82
 msgid "Fileman Settings"
 msgstr "Datei-Manager-Einstellungen"
 
 #: src/modules/fileman/e_mod_config.c:159
-#, fuzzy
 msgid "Grid Icons"
-msgstr "Datei-Icons"
+msgstr "Raster-Icons"
 
 #: src/modules/fileman/e_mod_config.c:161
-#, fuzzy
 msgid "Custom Icons"
-msgstr "Benutzerdefiniert"
+msgstr "Angepasste Icons"
 
 #: src/modules/fileman/e_mod_config.c:163
 msgid "Custom Grid Icons"
-msgstr ""
+msgstr "Benuzerdefinierte Raster-Icons"
 
 #: src/modules/fileman/e_mod_config.c:166
 msgid "Custom Smart Grid Icons"
-msgstr ""
+msgstr "Benutzerdefinierte geschickt plazierte Raster-Icons"
 
 #: src/modules/fileman/e_mod_config.c:173
-#, fuzzy
 msgid "Icon Size"
-msgstr "Icon-Name"
+msgstr "Icon-Größe"
 
 #: src/modules/fileman/e_mod_config.c:179
 msgid "Open Dirs In Place"
-msgstr ""
+msgstr "Öffne Verzeichnisse in aktuellem Fenster"
 
 #: src/modules/fileman/e_mod_config.c:182
 msgid "Sort Dirs First"
-msgstr ""
+msgstr "Ordne Verzeichnisse zuerst an"
 
 #: src/modules/fileman/e_mod_config.c:185
 msgid "Use Single Click"
-msgstr ""
+msgstr "Verwende einfachen Klick"
 
 #: src/modules/fileman/e_mod_config.c:188
-#, fuzzy
 msgid "Show Icon Extension"
-msgstr "Zeige Icon-Beschriftung"
+msgstr "Zeige Icon-Erweiterung"
 
 #: src/modules/fileman/e_mod_config.c:191
 msgid "Show Full Path"
-msgstr ""
+msgstr "Zeige kompletten Pfad"
 
 #: src/modules/fileman/e_mod_config.c:194
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Zeige Popup beim Arbeitsflächenwechsel"
+msgstr "Zeige Arbeitsflächenicons"
 
 #: src/modules/fileman/e_mod_config.c:197
 #, fuzzy
@@ -5806,19 +5943,19 @@ msgstr "Schattenfarbe"
 msgid "Go to Parent Directory"
 msgstr "Gehe zum übergeordneten Verzeichnis"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Bestimmte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Befehl ausführen ..."
@@ -5998,8 +6135,9 @@ msgid "Click to set"
 msgstr "Klicken zum Aktivieren"
 
 #: src/modules/pager/e_mod_config.c:169
+#, fuzzy
 msgid "Drag and Drop button"
-msgstr "\"Drag and Drop\"-Schaltfläche (Behält rel. Plazierung)"
+msgstr "\"Drag and Drop\"-Schaltfläche (behält rel. Plazierung)"
 
 #: src/modules/pager/e_mod_config.c:176
 msgid "Drag whole desktop"
@@ -6042,7 +6180,7 @@ msgstr "Fensterlisten-Einstellungen"
 #: src/modules/pager/e_mod_config.c:215
 #, fuzzy
 msgid "Show popup on urgent window"
-msgstr "Zeige Popup auf wichtigem Fenster"
+msgstr "Zeige Popup bei wichtigen Fenstern"
 
 #: src/modules/pager/e_mod_config.c:218
 msgid "Popup on urgent window sticks on the screen"
@@ -6072,8 +6210,8 @@ msgid ""
 "already taken by internal<br>code for context menus. <br>This button only "
 "works in the Popup"
 msgstr ""
-"Sie können die rechte Maustaste nicht<br>dafür verwenden, da Sie bereits "
-"intern<br>für Kontextmenüs vergeben wurde."
+"Sie können die rechte Maustaste nicht<br>dafür verwenden, da sie bereits "
+"intern<br>für Kontextmenüs verwendet wird."
 
 #: src/modules/pager/e_mod_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
@@ -6086,8 +6224,9 @@ msgid "Virtual Desktops Configuration"
 msgstr "Arbeitsflächenkonfiguration"
 
 #: src/modules/pager/e_mod_main.c:2806
+#, fuzzy
 msgid "Show Pager Popup"
-msgstr ""
+msgstr "Arbeitsflächenumschalter-Popup-Einstellungen"
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
 #, fuzzy
@@ -6109,7 +6248,7 @@ msgstr "Popup-Geschwindigkeit"
 msgid "Popup Desk Down"
 msgstr "Klappe Arbeitsfläche nach unten"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Start"
 
@@ -6117,122 +6256,122 @@ msgstr "Start"
 msgid "Temperature Configuration"
 msgstr "Temperatureinstellungen"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Angezeigte Einheit"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Abfrageinterval"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Schnell"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Langsam"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Sehr langsam"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Hohe Temperatur"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Niedrige Temperatur"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 °F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 °C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 °C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 °C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 °C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 °C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperaturanzeige"
 
 #: src/modules/wizard/e_wizard.c:341
+#, fuzzy
 msgid "Welcome to Enlightenment 東京"
-msgstr "Herzlich Willkommen bei Enlightenment"
+msgstr "Herzlich Willkommen in Enlightenment"
 
 #: src/modules/wizard/e_wizard.c:343
-#, fuzzy
 msgid "Next"
-msgstr "NetWM"
+msgstr "Weiter"
 
 #: src/modules/wizard/e_wizard.c:344
 msgid "Back"
@@ -6242,18 +6381,159 @@ msgstr "Zurück"
 msgid "Choose Language"
 msgstr "Sprache auswählen"
 
+#~ msgid "Unknown Data"
+#~ msgstr "Unbekannte Daten"
+
+#~ msgid "Enlightenment Starting. Please wait."
+#~ msgstr "Enlightenment startet. Bitte warten..."
+
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr "Ihr Akku ist bald leer.<br>Sie sollten auf Netzstrom wechseln."
+
 #~ msgid "NO INFO"
 #~ msgstr "KEINE INFORMATIONEN"
 
 #~ msgid "NO BAT"
 #~ msgstr "KEINE BATTERIE"
 
-#~ msgid "Error - Invalid Button"
-#~ msgstr "Fehler - Falsche Schaltfläche"
+#~ msgid "BAD DRIVER"
+#~ msgstr "FALSCHER TREIBER"
+
+#~ msgid "FULL"
+#~ msgstr "VOLL"
+
+#~ msgid "High"
+#~ msgstr "Hoch"
+
+#~ msgid "Low"
+#~ msgstr "Niedrig"
+
+#~ msgid "Danger"
+#~ msgstr "Gefahr"
+
+#~ msgid "Charging"
+#~ msgstr "Laden"
+
+#~ msgid "Enlightenment Battery Module"
+#~ msgstr "Enlightenment Batterie-Modul"
+
+#~ msgid ""
+#~ "A basic battery meter that uses either<hilight>ACPI</hilight> or "
+#~ "<hilight>APM</hilight><br>on Linux to monitor your battery and AC power "
+#~ "adaptor<br>status. This will work under Linux and FreeBSD and is "
+#~ "only<br>as accurate as your BIOS or kernel drivers."
+#~ msgstr ""
+#~ "Eine Batterieladestandsanzeige die entweder <hilight>ACPI</hilight> oder "
+#~ "<hilight>APM</hilight> nutzt<br>um den Batterieladestand den Netztstatus "
+#~ "anzuzeigen.<br>Dies funktioniert nur unter Linux; die Genauigkeit hängt "
+#~ "dabei<br>von Ihrem BIOS bzw. Kerneltreiber ab."
+
+#~ msgid "Enlightenment Clock Module"
+#~ msgstr "Enlightenment Uhr-Modul"
+
+#~ msgid "A simple module to give E17 a clock."
+#~ msgstr "Eine einfache Uhr für E17."
+
+#~ msgid "Enlightenment Conf Module"
+#~ msgstr "Enlightenment Konfigurationsmodul"
+
+#~ msgid "A module for displaying a configuration panel."
+#~ msgstr "Ein Modul um eine Konfigurationskonsole anzuzeigen."
 
-#, fuzzy
 #~ msgid "Application Categories"
-#~ msgstr "Anwendungsmenüs"
+#~ msgstr "Anwendungskategorien"
+
+#~ msgid "Enlightenment Configuration Module - Applications"
+#~ msgstr "Enlightenment Konfigurationsmodul - Anwendungen"
+
+#~ msgid "Configuration dialog for applications."
+#~ msgstr "Konfigurationsdialog für Anwendungen."
+
+#~ msgid "Enlightenment Configuration Module - Borders"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fensterrahmen"
+
+#~ msgid "Configuration dialog for borders."
+#~ msgstr "Konfigurationsdialog für Fensterrahmen."
+
+#~ msgid "Enlightenment Configuration Module - Client List Menu"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fensterlistenmenü"
+
+#~ msgid "Configuration dialog for client list menu."
+#~ msgstr "Konfigurationsdialog für das Fensterlistenmenü."
+
+#~ msgid "Enlightenment Configuration Module - Colors"
+#~ msgstr "Enlightenment Konfigurationsmodul - Farben"
+
+#~ msgid "Configuration dialog for colors."
+#~ msgstr "Konfigurationsdialog für Farben."
+
+#~ msgid "Enlightenment Configuration Module - Desk"
+#~ msgstr "Enlightenment Konfigurationsmodul - Arbeitsfläche"
+
+#~ msgid "Configuration dialog for desk."
+#~ msgstr "Konfigurationsdialog für die Arbeitsfläche."
+
+#~ msgid "Enlightenment Configuration Module - Screen Lock"
+#~ msgstr "Enlightenment Konfigurationsmodul - Bildschirmsperre"
+
+#~ msgid "Configuration dialog for screen lock."
+#~ msgstr "Konfigurationsdialog für die Bildschirmsperre."
+
+#~ msgid "Enlightenment Configuration Module - Virtual Desktops"
+#~ msgstr "Enlightenment Konfigurationsmodul - virtuelle Arbeitsflächen"
+
+#~ msgid "Configuration dialog for virtual desktops."
+#~ msgstr "Konfigurationsdialog für virtuelle Arbeitsflächen."
+
+#~ msgid "Enlightenment Configuration Module - Dialogs"
+#~ msgstr "Enlightenment Konfigurationsmodul - Dialoge"
+
+#~ msgid "Configuration dialog for dialogs."
+#~ msgstr "Konfigurationsdialog für Dialoge."
+
+#~ msgid "Enlightenment Configuration Module - Screen Resolution"
+#~ msgstr "Enlightenment Konfigurationsmodul - Bildschirmauflösung"
+
+#~ msgid "Configuration dialog for screen resolution."
+#~ msgstr "Konfigurationsdialog für die Bildschirmauflösung."
+
+#~ msgid "Enlightenment Configuration Module - Power Management"
+#~ msgstr "Enlightenment Konfigurationsmodul - Energiemanagement"
+
+#~ msgid "Configuration dialog for power management."
+#~ msgstr "Konfigurationsdialog für das Energiemanagement."
+
+#~ msgid "Enlightenment Configuration Module - Engine"
+#~ msgstr "Enlightenment-Konfiguration - Engine"
+
+#~ msgid "Configuration dialog for engine."
+#~ msgstr "Konfigurationsdialog für die Engine"
+
+#~ msgid "Enlightenment Configuration Module - Run Command"
+#~ msgstr "Enlightenment Konfigurationsmodul - \"Befehl ausführen\""
+
+#~ msgid "Configuration dialog for run command."
+#~ msgstr "Konfigurationsdialog für \"Befehl ausführen\"."
+
+#~ msgid "Enlightenment Configuration Module - Fonts"
+#~ msgstr "Enlightenment Konfigurationsmodul - Schriftarten"
+
+#~ msgid "Configuration dialog for fonts."
+#~ msgstr "Konfigurationsdialog für Schriftarten."
+
+#~ msgid "Enlightenment Configuration Module - Icon Theme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Icon-Thema"
+
+#~ msgid "Configuration dialog for icon theme."
+#~ msgstr "Konfigurationsdialog für das Icon-Thema."
+
+#~ msgid "Enlightenment Configuration Module - Input Methods"
+#~ msgstr "Enlightenment Konfigurationsmodul - EIngabemethoden"
+
+#~ msgid "Configuration dialog for input methods."
+#~ msgstr "Konfigurationsdialog für Eingabemethoden."
 
 #~ msgid "Bulgarian"
 #~ msgstr "Bugarisch"
@@ -6435,9 +6715,6 @@ msgstr "Sprache auswählen"
 #~ msgid "Armenian"
 #~ msgstr "Armenisch"
 
-#~ msgid "Interlingua"
-#~ msgstr "Interlingua"
-
 #~ msgid "Indonesian"
 #~ msgstr "Indonesisch"
 
@@ -7383,271 +7660,125 @@ msgstr "Sprache auswählen"
 #~ msgid "Zimbabwe"
 #~ msgstr "Simbabwe"
 
-#~ msgid "Pager Settings"
-#~ msgstr "Arbeitsflächenumschaltereinstellungen"
-
-#~ msgid "Urgent window"
-#~ msgstr "Wichtiges Fenster"
-
-#~ msgid "Unknown Data"
-#~ msgstr "Unbekannte Daten"
-
-#~ msgid "Enlightenment Starting. Please wait."
-#~ msgstr "Enlightenment startet. Bitte warten..."
-
-#~ msgid "Enlightenment Battery Module"
-#~ msgstr "Enlightenment Batterie-Modul"
-
-#~ msgid ""
-#~ "A basic battery meter that uses either<hilight>ACPI</hilight> or "
-#~ "<hilight>APM</hilight><br>on Linux to monitor your battery and AC power "
-#~ "adaptor<br>status. This will work under Linux and FreeBSD and is "
-#~ "only<br>as accurate as your BIOS or kernel drivers."
-#~ msgstr ""
-#~ "Eine Batterieladestandsanzeige die entweder <hilight>ACPI</hilight> oder "
-#~ "<hilight>APM</hilight> nutzt<br>um den Batterieladestand den Netztstatus "
-#~ "anzuzeigen.<br>Dies funktioniert nur unter Linux; die Genauigkeit hängt "
-#~ "dabei<br>von Ihrem BIOS bzw. Kerneltreiber ab."
-
-#~ msgid "Enlightenment Clock Module"
-#~ msgstr "Enlightenment Uhr-Modul"
-
-#~ msgid "A simple module to give E17 a clock."
-#~ msgstr "Eine einfache Uhr für E17."
-
-#, fuzzy
-#~ msgid "Enlightenment Conf Module"
-#~ msgstr "Enlightenment Uhr-Modul"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Applications"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Borders"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for borders."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Client List Menu"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Colors"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for colors."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Desk"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for desk."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Lock"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen lock."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Virtual Desktops"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
-
-#, fuzzy
-#~ msgid "Configuration dialog for virtual desktops."
-#~ msgstr "Arbeitsflächen konfigurieren"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Dialogs"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for dialogs."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Resolution"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Power Management"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Engine"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for engine."
-#~ msgstr "Objekte"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Run Command"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for run command."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Fonts"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for fonts."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Icon Theme"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for icon theme."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Input Methods"
-#~ msgstr "Enlightenment-Konfiguration"
-
-#, fuzzy
-#~ msgid "Configuration dialog for input methods."
-#~ msgstr "Standardkonfigurationsdialogmodus"
-
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Language"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Sprache"
+
+#~ msgid "Configuration dialog for language and locale."
+#~ msgstr "Konfigurationsmodul für Sprache und Lokalisierung."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Key Bindings"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Tastenbelegungen"
 
-#, fuzzy
 #~ msgid "Configuration dialog for key bindings."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für Tastenbelegungen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Menu Settings"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Menüeinstellungen"
+
+#~ msgid "Configuration dialog for menus settings."
+#~ msgstr "Konfigurationsdialog für Menüeinstellungen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - File Icons"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Datei-Icons"
 
-#, fuzzy
 #~ msgid "Configuration dialog for file icons."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für Datei-Icons."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Mouse Bindings"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Maustastenbelegungen"
+
+#~ msgid "Configuration dialog for mouse bindings."
+#~ msgstr "Konfigurationsdialog für Maustastenbelegungen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Mouse Cursor"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Mauszeiger"
 
-#, fuzzy
 #~ msgid "Configuration dialog for mouse cursor."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für den Mauszeiger."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Mouse Acceleration"
-#~ msgstr ""
-#~ "Enlightenment kann die Mausbeschleunigungs-Einstellungen nicht "
-#~ "konfigurieren."
+#~ msgstr "Enlightenment Konfigurationsmodul - Mausbeschleunigung"
+
+#~ msgid "Configuration dialog for mouse acceleration."
+#~ msgstr "Konfigurationsdialog für die Mausbeschleunigung."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Search Directories"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Suchpfade"
+
+#~ msgid "Configuration dialog for search directories."
+#~ msgstr "Konfigurationsdialog für Suchpfade"
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Performance"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Leistung"
 
-#, fuzzy
 #~ msgid "Configuration dialog for performance."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für Leistungseinstellungen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Profiles"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Profile"
+
+#~ msgid "Configuration dialog for config profiles."
+#~ msgstr "Konfigurationsdialog für Konfigurationsprofile."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Screen Saver"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Bildschirmschoner"
 
-#, fuzzy
 #~ msgid "Configuration dialog for screen saver."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für den Bildschirmschoner."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Shelves"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Modulablagen"
 
-#, fuzzy
 #~ msgid "Configuration dialog for shelves."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für Modulablagen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Startup"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Startanimation"
 
-#, fuzzy
 #~ msgid "Configuration dialog for startup."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für die Startanimation."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Theme"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Themen"
 
-#, fuzzy
 #~ msgid "Configuration dialog for theme."
-#~ msgstr "Objekte"
+#~ msgstr "Konfigurationsdialog für Themen."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Transitions"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Übergänge"
+
+#~ msgid "Configuration dialog for transitions."
+#~ msgstr "Konfigurationsdialog für Übergänge."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Wallpaper"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Hingergrundbild"
+
+#~ msgid "Configuration dialog for wallpaper configuration."
+#~ msgstr "Konfigurationsdialog für Hintergrundbildkonfiguration."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Window Display"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fensteranzeige"
+
+#~ msgid "Configuration dialog for window display."
+#~ msgstr "Konfigurationsdialog für Fensteranzeige."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Window Focus"
-#~ msgstr "Enlightenmentkonfiguration Schreibprobleme"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fensterfokusierung"
 
-#, fuzzy
 #~ msgid "Configuration dialog for window focus."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Konfigurationsdialog für Fensterfokusierung."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Window Manipulation"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fenstermanipulation"
 
-#, fuzzy
 #~ msgid "Configuration dialog for window manipulation."
-#~ msgstr "Erlaube Veränderungen an Fenstern"
+#~ msgstr "Konfigurationsdialog für Fenstermanipulation."
 
-#, fuzzy
 #~ msgid "Enlightenment Configuration Module - Window List"
-#~ msgstr "Enlightenment-Konfiguration"
+#~ msgstr "Enlightenment Konfigurationsmodul - Fensterliste"
 
-#, fuzzy
 #~ msgid "Configuration dialog for window list."
-#~ msgstr "Standardkonfigurationsdialogmodus"
+#~ msgstr "Fensterlistenkonfigurationsdialog."
 
 #~ msgid "CPU Frequency Controller Module"
 #~ msgstr "CPU-Frequenz-Kontrollmodul"
@@ -7671,17 +7802,25 @@ msgstr "Sprache auswählen"
 #~ "Schatten<br>auf die Arbeitsfläche werfen -- ohne jegliche X-Server-"
 #~ "Erweiterungen<br>oder Hardware-Beschleunigung."
 
-#, fuzzy
 #~ msgid "Enlightenment Exebuf Module"
-#~ msgstr "IBox-Modul"
+#~ msgstr "Enlightenment \"Exebuf\"-Modul"
+
+#~ msgid "A module for executing apps just by typing names."
+#~ msgstr "Ein Modul um Anwendungen durch Namenseingabe auszuführen."
 
-#, fuzzy
 #~ msgid "Enlightenment File Manager"
-#~ msgstr "Enlightenment %s Modul"
+#~ msgstr "Enlightenment Dateimanager"
+
+#~ msgid "A module for providing a file manager."
+#~ msgstr "Ein Modul um einen Dateimanager bereitzustellen."
 
-#, fuzzy
 #~ msgid "Enlightenment Winlist Module"
-#~ msgstr "Enlightenment %s Modul"
+#~ msgstr "Enlightenment Fensterlistenmodul"
+
+#~ msgid "A module for displaying a list of windows to switch between."
+#~ msgstr ""
+#~ "Ein Modul um eine Liste von Fenstern zwischen denen gewechselt werden "
+#~ "kann anzuzeigen."
 
 #~ msgid "Enlightenment IBar Module"
 #~ msgstr "IBar-Modul"
@@ -7708,10 +7847,30 @@ msgstr "Sprache auswählen"
 #~ "Dies ist das IBox Modul für Enlightenment.<br>Es zeigt minimierte "
 #~ "Programme in Form von Icons an."
 
-#, fuzzy
 #~ msgid "Enlightenment Layout Module"
 #~ msgstr "Enlightenment Startschaltflächenmodul"
 
+#~ msgid ""
+#~ "Can restrict or implement specific window layout policies for specialised "
+#~ "situations."
+#~ msgstr ""
+#~ "Hier können bestimmte Fensteranordnungsrichtlinien für bestimmte "
+#~ "Situationen festgelegt oder verhindert werden."
+
+#~ msgid "Pager Settings"
+#~ msgstr "Arbeitsflächenumschaltereinstellungen"
+
+#~ msgid "Drag whole desktop (Move all windows of a desktop)"
+#~ msgstr ""
+#~ "Verschiebe komplette Arbeitsfläche (betrifft alle Fenster der "
+#~ "Arbeitsfläche)"
+
+#~ msgid "Urgent window"
+#~ msgstr "Wichtiges Fenster"
+
+#~ msgid "Error - Invalid Button"
+#~ msgstr "Fehler - Falsche Schaltfläche"
+
 #~ msgid "Enlightenment Pager Module"
 #~ msgstr "Arbeitsflächenumschalter-Modul"
 
@@ -7738,9 +7897,13 @@ msgstr "Sprache auswählen"
 #~ "ausliest.<br>Es ist für moderne Laptops mit sehr schnellen Prozessoren "
 #~ "besonders nützlich, <br>da diese sehr heiß werden können."
 
-#, fuzzy
 #~ msgid "Enlightenment First Run Wizard Module"
-#~ msgstr "Enlightenment Startschaltflächenmodul"
+#~ msgstr "Enlightenment Erststartassistentzmodul"
+
+#~ msgid ""
+#~ "A module for setting up configuration for Enlightenment for the first "
+#~ "time."
+#~ msgstr "Ein Modul um eine Erstkonfiguration von Enlightenment vorzunehmen."
 
 #~ msgid "Enlightenment cannot set up its window list system."
 #~ msgstr ""
diff --git a/po/enlightenment.pot b/po/enlightenment.pot
index ec35893..506ffaa 100644
--- a/po/enlightenment.pot
+++ b/po/enlightenment.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,8 +20,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr ""
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr ""
@@ -56,15 +56,15 @@ msgstr ""
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr ""
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr ""
 
@@ -121,314 +121,314 @@ msgid ""
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr ""
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -438,136 +438,136 @@ msgstr ""
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr ""
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr ""
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr ""
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr ""
 
@@ -575,11 +575,11 @@ msgstr ""
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr ""
 
@@ -608,11 +608,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr ""
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -620,7 +620,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -630,7 +630,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -639,7 +639,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -648,7 +648,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -656,17 +656,16 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr ""
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -675,19 +674,20 @@ msgstr ""
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr ""
 
@@ -703,14 +703,14 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr ""
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr ""
@@ -768,7 +768,7 @@ msgid "Desktop Entry Editor"
 msgstr ""
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr ""
@@ -804,7 +804,7 @@ msgstr ""
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr ""
@@ -849,6 +849,7 @@ msgstr ""
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr ""
 
@@ -856,7 +857,7 @@ msgstr ""
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -864,15 +865,15 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr ""
 
@@ -880,216 +881,216 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr ""
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1141,7 +1142,7 @@ msgid "Owner can write"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1174,49 +1175,49 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1230,27 +1231,27 @@ msgstr ""
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1276,7 +1277,7 @@ msgid ""
 "init<br>splash theme that is correctly made or fix the<br>one you use."
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr ""
 
@@ -1310,21 +1311,21 @@ msgid "Lock program changing:"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr ""
 
@@ -1333,12 +1334,12 @@ msgid "Iconified state"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr ""
 
@@ -1354,7 +1355,7 @@ msgstr ""
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr ""
 
@@ -1374,126 +1375,126 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1502,6 +1503,10 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr ""
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1514,7 +1519,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr ""
 
@@ -1610,11 +1615,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr ""
 
@@ -1622,15 +1627,15 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1644,11 +1649,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1656,7 +1661,7 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1673,118 +1678,118 @@ msgid ""
 "affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1846,10 +1851,12 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr ""
 
@@ -1875,52 +1882,52 @@ msgstr ""
 msgid "Show/Hide All Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr ""
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr ""
 
@@ -1929,13 +1936,13 @@ msgid "Shelf Configuration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
@@ -1944,12 +1951,12 @@ msgid "Medium"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
@@ -1987,7 +1994,7 @@ msgid "%3.0f pixels"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr ""
 
@@ -2449,29 +2456,29 @@ msgstr ""
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, 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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, 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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2479,12 +2486,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
@@ -2762,9 +2769,9 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr ""
 
@@ -2801,39 +2808,39 @@ msgstr ""
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -2844,69 +2851,51 @@ msgstr ""
 msgid "%1.0f minutes"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
 msgstr ""
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr ""
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr ""
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -2937,7 +2926,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr ""
 
@@ -2994,7 +2983,7 @@ msgstr ""
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3096,7 +3085,7 @@ msgid "Error Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr ""
 
@@ -3105,7 +3094,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr ""
 
@@ -3114,12 +3103,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr ""
 
@@ -3132,12 +3121,12 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr ""
 
@@ -3174,7 +3163,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr ""
 
@@ -3260,6 +3249,7 @@ msgstr ""
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr ""
 
@@ -3301,10 +3291,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr ""
 
@@ -3619,11 +3609,11 @@ msgstr ""
 msgid "Default Engine"
 msgstr ""
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr ""
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3747,192 +3737,196 @@ msgstr ""
 msgid "Run Command"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+msgid "Desktop Icon"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -3971,7 +3965,7 @@ msgid "New"
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr ""
 
@@ -4019,22 +4013,62 @@ msgstr ""
 msgid "Input Method Settings"
 msgstr ""
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+msgid "Interaction Settings"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, c-format
+msgid "%1.2f sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+msgid "Interaction"
+msgstr ""
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr ""
 
@@ -4346,11 +4380,6 @@ msgstr ""
 msgid "Cursor Size"
 msgstr ""
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr ""
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr ""
@@ -4385,7 +4414,7 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr ""
 
@@ -4542,11 +4571,6 @@ msgstr ""
 msgid "Time until X screensaver alternates"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr ""
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr ""
@@ -4603,23 +4627,23 @@ msgstr ""
 msgid "Startup"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr ""
 
@@ -4663,38 +4687,43 @@ msgstr ""
 msgid "Transitions"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr ""
 
@@ -4744,7 +4773,7 @@ msgstr ""
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr ""
 
@@ -4794,22 +4823,79 @@ msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5099,6 +5185,52 @@ msgstr ""
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+msgid "Class:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+msgid "Title:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+msgid "Role:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+msgid "<No Role>"
+msgstr ""
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr ""
@@ -5433,19 +5565,19 @@ msgstr ""
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr ""
 
@@ -5714,7 +5846,7 @@ msgstr ""
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr ""
 
@@ -5722,111 +5854,111 @@ msgstr ""
 msgid "Temperature Configuration"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr ""
 
diff --git a/po/eo.gmo b/po/eo.gmo
index 4520454..2d01fbe 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index 932e8c1..0b2b708 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-12-10 22:43+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <fr at li.org>\n"
@@ -26,8 +26,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Pri Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -74,15 +74,15 @@ msgstr "Ĉu vi cestas, ke vi deziras mortigi tiun fenestron?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Jes"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Ne"
 
@@ -147,334 +147,334 @@ msgstr ""
 "Vi petis diskodormi vian komputilon.<br><br>Ĉu vi certas ke vi volas dormigi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Fenestro : Agoj"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Movi"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Grandecŝanĝi"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menuo"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Fenestra Menuo"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Plialtigi"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Malplialtigi"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Fermi"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Mortigi"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Fenestro : stato"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Inversigi Fiksan Modon"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Inversigi Piktograman Modon"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Inversigi Plenekranan Modon"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maksimumigi Vertikale"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maksimumigi Horizontale"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maksimumigi Plenekrane"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimumiga Modo \"Inteligenta\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimumiga Modo \"Ekspansia\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimumiga Modo \"Pleniga\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Baskulo de Subvolva Modo"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Baskulo de Suprvolva Modo"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Baskulo de Maldesktrvolva Modo"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Baskulo de Dekstrvolva Modo"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Inversigo de Ombriga Modo"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Inversigi Senrandan Staton"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Inversigi Pinglatan Staton"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Labortablo"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Labortabla Åœango al maldekstro"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Labortabla Åœango al dekstro"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Labortabla Åœango al supro"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Labortabla Åœango al subo"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Labortabla Åœango LaÅ­..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Vidigi la Labortablon"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Labortabla Åœango por..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Labortabla Åœango Linie..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "InterŜanĝi kun la 0-a Labortablo"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "InterŜanĝi kun 1-a Labortablo"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "InterŜanĝi kun 2-a Labortablo"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "InterŜanĝi kun 3-a Labortablo"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "InterŜanĝi kun 4-a Labortablo"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "InterŜanĝi kun 5-a Labortablo"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "InterŜanĝi kun 6-a Labortablo"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "InterŜanĝi kun 7-a Labortablo"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "InterŜanĝi kun 8-a Labortablo"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "InterŜanĝi kun 9-a Labortablo"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "InterŜanĝi kun 10-a Labortablo"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "InterŜanĝi kun 11-a Labortablo"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "InterŜanĝi kun la Labortablo..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Labortabla Åœango al maldekstro"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Labortabla Åœango al dekstro"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Labortabla Åœango al supro"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Labortabla Åœango al subo"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Labortabla Åœango LaÅ­..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Labortabla Åœango por..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Labortabla Åœango Linie..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "InterŜanĝi kun la 0-a Labortablo"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "InterŜanĝi kun 1-a Labortablo"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "InterŜanĝi kun 2-a Labortablo"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "InterŜanĝi kun 3-a Labortablo"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "InterŜanĝi kun 4-a Labortablo"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "InterŜanĝi kun 5-a Labortablo"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "InterŜanĝi kun 6-a Labortablo"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "InterŜanĝi kun 7-a Labortablo"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "InterŜanĝi kun 8-a Labortablo"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "InterŜanĝi kun 9-a Labortablo"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "InterŜanĝi kun 10-a Labortablo"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "InterŜanĝi kun 11-a Labortablo"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "InterŜanĝi kun la Labortablo..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -484,136 +484,136 @@ msgstr "InterŜanĝi kun la Labortablo..."
 msgid "Screen"
 msgstr "Ekrano"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Sendi Muson al 0-a Ekrano"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Sendi Muson al 1-a Ekrano"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Sendi Muson al Ekrano..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Sendi Muson ĝis la proksima ekrano"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Sendi muson ĝis la antaŭa ekrano"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Sendi muson ĝis la antaŭa/proksima ekranoj..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Fenestro : Movado"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Äœis Sekvonta Labortablo"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Äœis AntaÅ­a Labortablo"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "LaÅ­ Labortablo #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Al Labortablo..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Montri ĉefMenuon"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Montri Preferatajn Menuon"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Vidigi \"Ĉiuj Aplikaĵoj\" Menuon"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Vidigi Klientan Menuon"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Vidigi Menuon..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Lanĉi"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Difinita Komando"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Eliri"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Elsaluti"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Tuj Eliri"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Sistemo"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Estingi"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "PaÅ­zi"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Diskodormigi"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Labortabla Åœloso"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Purigi Fenestrojn"
 
@@ -621,11 +621,11 @@ msgstr "Purigi Fenestrojn"
 msgid "Set As Background"
 msgstr "Difini kiel Tapeton"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "Legado de labortablaj dosieroj farita"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Legado de labortabla dosiero"
 
@@ -666,11 +666,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Labortablo %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Agordo Aktualigita"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -681,7 +681,7 @@ msgstr ""
 "eraro ne povas esti definata.<br><br>La dosiero kie la eraro okazis estis:"
 "<br>%s<br><br>Tiu dosiero estis forviŝita por eviti malbonigi datumojn.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -697,7 +697,7 @@ msgstr ""
 "okazis, estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti "
 "koruptadon de datumoj.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -710,7 +710,7 @@ msgstr ""
 "<br><br>La dosiero kie la eraro okazis estis:<br>%s<br><br>Ĉi tiu dosiero "
 "estas forigita por eviti koruptadon de datumoj.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -724,7 +724,7 @@ msgstr ""
 "estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti koruptadon de "
 "datumoj.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -736,17 +736,16 @@ msgstr ""
 "estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti koruptadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problemoj de skribo de Enlightenment Konfiguraĵo"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -755,19 +754,20 @@ msgstr "Problemoj de skribo de Enlightenment Konfiguraĵo"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "Konfirmi"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Plidetale"
 
@@ -783,14 +783,14 @@ msgstr "Apliki"
 msgid "Extensions"
 msgstr "Etendiloj"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Moduloj"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Ujo %d"
@@ -859,7 +859,7 @@ msgid "Desktop Entry Editor"
 msgstr "Redaktilo de Labortabla Enigo"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Piktogramo"
@@ -895,7 +895,7 @@ msgstr "Äœenerala Nomo"
 msgid "Window Class"
 msgstr "Fenestra Klaso"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Kategorioj"
@@ -940,6 +940,7 @@ msgstr "Elekti Piktogramon"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Rezigni"
 
@@ -947,7 +948,7 @@ msgstr "Rezigni"
 msgid "Select an Executable"
 msgstr "Elekti Lanĉeblon"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -955,15 +956,15 @@ msgstr "Elekti Lanĉeblon"
 msgid "Delete"
 msgstr "Forviŝi"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Eltondi"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Kopii"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Alglui"
 
@@ -971,24 +972,24 @@ msgstr "Alglui"
 msgid "Select All"
 msgstr "Elekti Ĉion"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Lanĉa Eraro"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Eraro dum lanĉo de aplikaĵo"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -997,193 +998,194 @@ msgstr ""
 "Enlightenment ne povas lanĉi tiun aplikaĵon :<br><br>%s><br><br>La aplikaĵo "
 "malsukcesis komenci."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Eraro dum lanĉo de Aplikaĵo"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s haltis ruladon senatendite."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Elirsignala kodo %i sendita el %s."
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s interrompiĝis per InterrompSignalo."
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s interrompiĝis per ElirSignalo."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s interrompiĝis per ĉesigSignalo."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s interrompiĝis per glitpunkta eraro."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s interrompiĝis per Neinterrompebla Mortiga Signalo"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s interrompiĝis per Segmenta Misfunkcio."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s interrompiĝis per Rompita Dukto."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s interrompiĝis per FiniĝSignalo."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s interrompiĝis per Busa Eraro."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s interrompiĝis per Signala Numero %i."
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Eraraj Protokoloj"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Nenio erara mesaĝo ĉeestas."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Konservi Tiun Mesaĝon"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Erara Informaĵo"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Erara Signala informaĵo"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Eligitaj Datumoj"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Neniu eligo ĉeestas"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "Neekzistanta vojo"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s ne ekzistas"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosieroj"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Vidiga Modo"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Refreŝigi Rigardon"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Vidigi Kaŝitajn Dosierojn"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Memorigi Ordon"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Tuj Ordigi"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nova Dosierujo"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Renomi"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Ecoj"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Piktogramoj"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Listo"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Krei novan dosierujon"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nova Nomo de Dosierujo:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomi %s al:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Renomi Dosieron"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Konfirmi Forviŝon"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1237,7 +1239,7 @@ msgid "Owner can write"
 msgstr "Proprietulo povas skribi"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1270,49 +1272,49 @@ msgstr "Ligila Informaĵo"
 msgid "Select an Image"
 msgstr "Elekti bildon"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nekonata Datumportilo"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Demetebla Aparato"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Plata"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Eniga"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1326,27 +1328,27 @@ msgstr "Eniga"
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "AÅ­tomate rulumi enhavojn"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Ebligi Grandecŝanĝon"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Komenci movon/regrandigon de ĉi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Forviŝi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Ĉesi movon/regrandigon ĉi tiun vanaĵon"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1378,7 +1380,7 @@ msgstr ""
 "pravaloran plaÅ­dan etoson kiu korekte<br>estas farita aÅ­ korekti tion kion "
 "vi uzas."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Fenestraj ŝlosoj"
 
@@ -1412,21 +1414,21 @@ msgid "Lock program changing:"
 msgstr "Ŝanĝo de programa Ŝloso:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Pozicio"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Grando"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Stako"
 
@@ -1435,12 +1437,12 @@ msgid "Iconified state"
 msgstr "Piktogramigita stato"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Glueco"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Volva stato"
 
@@ -1456,7 +1458,7 @@ msgstr "Plenekraneco"
 msgid "Lock me from changing:"
 msgstr "Malpermesi min pri Ŝanĝo:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Randa stilo"
 
@@ -1476,126 +1478,126 @@ msgstr "Elsaluti kun tiu fenestra malfermo"
 msgid "Remember these Locks"
 msgstr "Memori tiujn ŝlosojn"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Ĉiam Supre"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normala"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Ĉiam Malsupre"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Grandegigi vertikale"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Grandegigi horizontale"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Malgrandegigi"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Memori"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Rando"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Sendi en Labortablo"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Pingli sur la Labortablo"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Malpingli de la Labortablo"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Åœtato"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Preterpasi"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Redakti Piktogramon"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Aldoni en la Menuon de Preferataĵoj"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Aldoni Fulmoklavon"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Aldoni tiun Aplikaĵon en la Lanĉilon"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Krei Piktogramon"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Fenestraj Ecoj"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Bildsimboligi"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Elekti Randan Stilon"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Uzi la defauxltan piktograman agordon"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Uzi donitan piktogramon de la aplikaĵo"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Uzi Piktogramon Definitan de Uzanto"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Volvita"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Glugita"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Plenekrana"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Fenestrolisto"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1604,6 +1606,11 @@ msgstr "Fenestrolisto"
 msgid "Pager"
 msgstr "Vokilo"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Preterpasi la Taskopleton"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1616,7 +1623,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Ecoj"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Titolo"
 
@@ -1712,11 +1719,11 @@ msgstr "NetWM Ecoj"
 msgid "Modal"
 msgstr "Modala"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Preterpasi la Taskopleton"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Forlasi Vokilon"
 
@@ -1724,15 +1731,15 @@ msgstr "Forlasi Vokilon"
 msgid "Hidden"
 msgstr "Kaŝita"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Fenestra Memoro"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Fenestraj ecoj ne estas unua kongrueco"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1755,11 +1762,11 @@ msgstr ""
 "hilight><br> kaj viaj agordoj estos akceptitaj. Klaku <hilight>Rezignu</"
 "hilight> se vi<br>ne certas kaj nenio estos influita."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Neniu kongrueca eco fiksita"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1771,7 +1778,7 @@ msgstr ""
 "ĝin</hilight>.<br><br>Vi devas defini almenaŭ 1 manieron por memorigi tiun "
 "fenestron."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1800,118 +1807,118 @@ msgstr ""
 "<hilight>OK</hilight><br>kaj viaj agordoj estos akceptataj. Alklaku "
 "<hilight>Rezigni</hilight> se vi<br> ne certas kaj nenio estos influata."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nenio"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Grandeco kaj Pozicio"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "ŝlosoj"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Grandeco, Pozicio kaj ŝlosoj"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Ĉio"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Memori uzante"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Fenestra nomo kaj klaso"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Fenestro Grado"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Fenestra tipo"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Nedaureco"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Memorendaj Ecoj"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Piktograma Prefero"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Virtuala Labortablo"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Aktuala Ekreno"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Forviŝi el Fenestrolisto"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Kongruas nur unu fenestron"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Restarigi tiun programon dum ensaluto"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Konfiguraĵo"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Dosiera administrilo"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "Breto"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Modulaj Agordoj"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Disponeblaj Moduloj"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Ŝarĝi Modulon"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Ŝarĝitaj Moduloj"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Malŝarĝi Modulon"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1976,10 +1983,12 @@ msgstr "Preferataj Aplikaĵoj"
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Fenestroj"
 
@@ -2005,52 +2014,52 @@ msgstr "Bretoj"
 msgid "Show/Hide All Windows"
 msgstr "Montri/Kaŝi ĉiujn Fenestrojn"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Neniu aplikaĵo)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Konfiguri Virtualajn Labortablojn"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Åœlosi Ekranon"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Diskodormi"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Elsaluti"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Neniu Fenestro)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Mislokitaj fenestroj"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Neniu nomo!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Neniu Breto)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Breto numero"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Aldoni Breton"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Forviŝi Breton"
 
@@ -2059,13 +2068,13 @@ msgid "Shelf Configuration"
 msgstr "Breta Konfiguraĵo"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Malgrandega"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Malgranda"
 
@@ -2074,12 +2083,12 @@ msgid "Medium"
 msgstr "Meza"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Granda"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandega"
 
@@ -2117,7 +2126,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f rastumeroj"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Stiloj"
 
@@ -2601,7 +2610,7 @@ msgstr "Agordi Bretojn"
 msgid "Almost Done"
 msgstr "PreskaÅ­ Finita"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2610,22 +2619,22 @@ 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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Eraro dum ŝarĝo de Modulo"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, 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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Modulo ne enhavas ĉiujn bezonatajn funkciojn"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2633,12 +2642,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment-a \"%s\" Modulo"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "ĉu vi volas malŝarĝi tiun modulon ?<br>"
 
@@ -2929,9 +2938,9 @@ msgstr "Aldoni al Preferata Menuo"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Iri al Patra Dosierujo"
 
@@ -2968,39 +2977,39 @@ msgstr "Malpermesita"
 msgid "Read-Write"
 msgstr "Lege skribe"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Konfiguraĵo Bateria Monitoro"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Basaj Agordoj"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Montri antaÅ­gardon kiam baterio estas baznivela"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "AntaÅ­enigitaj Agordoj"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Inspekti baterion je ĉiuj :"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f dosieroj"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Pepi kiam baterio estas malpli ol :"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3011,71 +3020,51 @@ msgstr "Pepi kiam baterio estas malpli ol :"
 msgid "%1.0f minutes"
 msgstr "%1.0f minutoj"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f porcentoj"
 
-#: src/modules/battery/e_mod_main.c:137
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f sekundoj"
+
+#: src/modules/battery/e_mod_main.c:129
 msgid "Battery"
 msgstr "Baterio"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Malalta bateria funkcio<br>Via baterio estas malaltnivela.<br>Vi devus "
-"interŝangi ĝin per alterna kurento."
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Baterio-mesurilo"
 
-#: src/modules/battery/e_mod_main.c:355
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
+#: src/modules/battery/e_mod_main.c:563
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "MALBONA PELILO"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "PLENA"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Alta"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Malalta"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Danĝero"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Ŝarĝanta"
-
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
-msgstr "Baterio-mesurilo"
-
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Horloĝo"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment-a Konfiguraĵo"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Elementoj"
 
@@ -3106,7 +3095,7 @@ msgid "Restart Applications"
 msgstr "Aplikaĵoj post relanĉo"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Ĉiuj Aplikaĵoj"
 
@@ -3163,7 +3152,7 @@ msgstr "Grupigi laÅ­"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3265,7 +3254,7 @@ msgid "Error Text"
 msgstr "Erara Teksto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Titolo de Menuo"
 
@@ -3274,7 +3263,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Menua Elemento"
 
@@ -3283,12 +3272,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Mova Teksto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "GrandecŜanĝa Teksto"
 
@@ -3301,12 +3290,12 @@ msgid "Winlist Label"
 msgstr "Fenestrolista Etikedo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Fenestrolista Titolo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Fenestraĵoj"
 
@@ -3343,7 +3332,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Lista Titolo"
 
@@ -3429,6 +3418,7 @@ msgstr "Labortabla Nomo"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -3470,10 +3460,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Persona"
 
@@ -3788,12 +3778,12 @@ msgstr "Ebligi Composite-on"
 msgid "Default Engine"
 msgstr "DefaÅ­lta Motoro"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Ebligi Composite-on"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3917,192 +3907,197 @@ msgstr "Alĝustigo de vertikala Akso"
 msgid "Run Command"
 msgstr "Lanĉi komandon"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Kerno"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Titola Breto"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Konfigura Titolo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Pri Titolo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Pri Versio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Pri Teksto"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Titolo de Labortabla Åœloso"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Pasvorto de Labortabla Åœloso"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Dialoga Eraro"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Lanĉobuf Komando"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Salutŝilda Titolo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Salutŝilda Teksto"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Salutŝilda Versio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Enigo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Kadro"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Etikedo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Butonoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "ŝovilo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Radiaj Butonoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Kontrolaj Butonoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Tekstolista Elemento"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Lista Elemento"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Administrilo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Vidigi Labortablajn Piktogramojn"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Malgrande Stiligita"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Normale Stiligita"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Grande Stiligita"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Tiparaj Agordoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Granda"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Tre Granda"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d rastrumeroj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Aktivigi Proprajn Tiparajn Klasojn"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Tiparoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Baza antaŭrigardo teksto: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Piktogramaj Klasoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Aktivigi Tiparan Klason"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Aludado"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bajtkodo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "AÅ­tomata"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Alternativaj Tiparoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Alternativa Nomo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Aktivigi Alternativecojn"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Teksto de Detala Antaŭrigardo: 我真的会写中文ĉĝĥĵŝŭ"
 
@@ -4141,7 +4136,7 @@ msgid "New"
 msgstr "Nova"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Eluzi..."
 
@@ -4192,22 +4187,64 @@ msgstr "Lingvo"
 msgid "Input Method Settings"
 msgstr "Tajpo-Metodaj Agordoj"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Elektaj Agordoj"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f rastrumeroj"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f rastrumeroj/sek"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f sekundoj"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interna"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Lingva Konfiguro"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Lingva Elektilo"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Lokaĵo elektita"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Lokaĵo"
 
@@ -4524,11 +4561,6 @@ msgstr "Uzi X11-an kursoron"
 msgid "Cursor Size"
 msgstr "Kursora Grandeco"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f rastrumeroj"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Musa kursoro"
@@ -4563,7 +4595,7 @@ msgid "Images"
 msgstr "Bildoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Etosoj"
 
@@ -4722,11 +4754,6 @@ msgstr "Daŭro ĝis XScreensaver ekas"
 msgid "Time until X screensaver alternates"
 msgstr "Tempo ĝis XScreensaver alternas"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekundoj"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Malplenado"
@@ -4785,23 +4812,23 @@ msgstr "Vidigi komencan ekranon dum startigo"
 msgid "Startup"
 msgstr "Komenco"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Etosa Elektilo"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Etosaj Kategorioj"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Atribui"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Forviŝi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Forviŝi ĉion"
 
@@ -4848,38 +4875,43 @@ msgstr "Tapeta Ŝanĝo"
 msgid "Transitions"
 msgstr "Transiroj"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Tapetaj Agordoj"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Uzi Etosan Tapeton"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Bildo..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Kolortransiro..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Kie enmeti la Tapeton"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Ĉiuj Labortabuloj"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Tiu ĉi labortablo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Tiu Ekrano"
 
@@ -4929,7 +4961,7 @@ msgstr "Eraro dum Kreo de Kolortransiro"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Pro ajn kialo, Enlightenment ne eblis krei transiron."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Elekti Bildon..."
 
@@ -4980,18 +5012,18 @@ msgid ""
 msgstr ""
 "\"Enlightenment\" ne eblas importi bildon<br>kial okazis eraroj dum konverto."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Tapeta Importada Eraro"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -4999,6 +5031,63 @@ msgstr ""
 "\"Enlightenment\" ne eblas importi tapeton.<br>Ĉu vi certas ke tiu tapeto "
 "validas?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5288,6 +5377,62 @@ msgstr "Permesi fenestran manuzon"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Fenestra Memoro"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Agordi Memorojn"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Aprioraĵoj"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Piktograma Nomo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Klaso"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Klaso"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Titolo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Titolo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Grado"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Neniom>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Agordoj de Fenestrolisto"
@@ -5645,19 +5790,19 @@ msgstr "Vidigi Ilobreton"
 msgid "Go to Parent Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Malfermi"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Malfermi per..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Specialaj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr "Propran komandon"
 
@@ -5946,7 +6091,7 @@ msgstr "Labortabla Åœango al supro"
 msgid "Popup Desk Down"
 msgstr "Labortabla Åœango al subo"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Startigo"
 
@@ -5954,111 +6099,111 @@ msgstr "Startigo"
 msgid "Temperature Configuration"
 msgstr "Temperatura Konfiguro"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Vidigi Unuoj"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Inspekta Intervalo"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Rapida"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Malrapida"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Malrapidega"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Alta Temperaturo"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Malalta Temperaturo"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensiloj"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperaturo"
 
@@ -6078,6 +6223,31 @@ msgstr "Reen"
 msgid "Choose Language"
 msgstr "Elekti Lingvon"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Malalta bateria funkcio<br>Via baterio estas malaltnivela.<br>Vi devus "
+#~ "interŝangi ĝin per alterna kurento."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "MALBONA PELILO"
+
+#~ msgid "FULL"
+#~ msgstr "PLENA"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Low"
+#~ msgstr "Malalta"
+
+#~ msgid "Danger"
+#~ msgstr "Danĝero"
+
+#~ msgid "Charging"
+#~ msgstr "Ŝarĝanta"
+
 #~ msgid "NO INFO"
 #~ msgstr "NENIU INFORMAĵO"
 
diff --git a/po/es.gmo b/po/es.gmo
index e6eb9f5..6c14dcb 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 6d87ced..9536dff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# PON-E TEAM translation of 0.0.1.
 # This file is put in the public domain.
 # Jose Biosca Martin <danky at zone-sys.net>, 2005.
 #
@@ -6,23 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2007-12-01 23:10-0300\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-03-17 10:51-0430\n"
 "Last-Translator: Guillermo Movia <guillermo.movia at gmail.com>\n"
 "Language-Team: PON-E TEAM <http://pon-e.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #: src/bin/e_about.c:66
 msgid "About Enlightenment"
 msgstr "Acerca de Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -39,14 +36,14 @@ msgid ""
 "have many bugs. You have been <hilight>WARNED!</hilight>"
 msgstr ""
 "Copyright © 1999-2007, por el Equipo de Desarrollo de Enlightenment."
-"<br><br>Esperamos que disfrutes utilizando este software tanto como nosotros "
-"nos hemos divertido escribiéndolo.<br><br>Este software se distribuye de "
-"esta forma sin garantías implícitas o explícitas. Este software está "
-"controlado por las condiciones de licencia, por favor lee los ficheros de "
-"licencia COPYING y COPYING-PLAIN que están en el sistema."
-"<br><br>Enlightenment se encuentra bajo<hilight>INTENSO DESARROLLO</hilight> "
-"y no es estable. Muchas características están incompletas o no existen aún y "
-"otras tienen fallos. Estas <hilight>¡AVISADO!</hilight>"
+"<br><br>Esperamos que disfrute utilizando este software tanto como nosotros "
+"disfrutamos escribiéndolo.<br><br>Este software se provee de esta forma sin "
+"garantías implícitas o explícitas. Este software está controlado por las "
+"condiciones de licencia, por favor lea los ficheros de licencia COPYING y "
+"COPYING-PLAIN que están en el sistema.<br><br>Enlightenment se encuentra "
+"bajo<hilight>INTENSO DESARROLLO</hilight> y no es estable. Muchas "
+"características están incompletas o no existen aún y otras tienen fallos. "
+"Estas <hilight>¡AVISADO!</hilight>"
 
 #: src/bin/e_about.c:104
 msgid "<title>The Team</title>"
@@ -60,8 +57,8 @@ msgid ""
 "you want to kill this window?"
 msgstr ""
 "Está a punto de matar a %s.<br><br>Tenga en cuenta que toda la información "
-"de esta ventana<br>que no haya sido guardada hasta ahora, será "
-"perdida<br><br>¿Está seguro de que quiere matar esta ventana?"
+"de esta ventana,<br>que no haya sido guardada hasta ahora, ¡se perderá!"
+"<br><br>¿Está seguro de que quiere matar esta ventana?"
 
 #: src/bin/e_actions.c:324
 msgid "Are you sure you want to kill this window?"
@@ -69,15 +66,15 @@ msgstr "¿Está seguro de matar esta ventana?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Si"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "No"
 
@@ -92,11 +89,12 @@ msgstr "Eligió salir de Enlightenment.<br><br>¿Está seguro de querer salir?"
 
 #: src/bin/e_actions.c:1664
 msgid "Are you sure you want to log out?"
-msgstr "¿Está seguro de querer salir?"
+msgstr "¿Está seguro de querer desconectarse?"
 
 #: src/bin/e_actions.c:1666
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr "Eligió salir de Enlightenment.<br><br>¿Está seguro de querer hacerlo?"
+msgstr ""
+"Usted esta apunto de desconectarse.<br><br>¿Está seguro de querer hacerlo?"
 
 #: src/bin/e_actions.c:1723 src/bin/e_actions.c:1841
 msgid "Are you sure you want to turn off?"
@@ -117,353 +115,334 @@ msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
-"Eligió reiniciar su computadora.<br><br>¿Está seguro de querer reiniciar?"
+"Pidió reiniciar su computadora.<br><br>¿Está seguro de querer reiniciarla?"
 
 #: src/bin/e_actions.c:1843
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr ""
-"Eligió suspender su computadora.<br><br>¿Está seguro de querer hacerlo?"
+msgstr "Pidió suspender su computadora.<br><br>¿Está seguro de querer hacerlo?"
 
 #: src/bin/e_actions.c:1900
 msgid "Are you sure you want to hibernate?"
-msgstr "¿Está seguro de querer hibernar su computadora?"
+msgstr "¿Está seguro de querer hibernar?"
 
 #: src/bin/e_actions.c:1902
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
-msgstr "Eligió hibernar su computadora.<br><br>¿Está seguro de querer hacerlo?"
+msgstr ""
+"Pidió hibernar su computadora.<br><br>¿Está seguro de querer suspender a "
+"disco?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Ventana : Acciones"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Cambiar tamaño"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menú de ventana"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Levantar"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
-msgstr "Abajo"
+msgstr "Bajar"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Ventana : Estado"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
-msgstr "Cambiar modo de pegado"
+msgstr "Alternar a Modo Pegajoso"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
-msgstr "Cambiar modo de íconos"
+msgstr "Alternar a Modo de iconos"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
-msgstr "Cambiar el modo de pantalla comlpeta"
+msgstr "Alternar a Modo de pantalla completa"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximizar Pantalla completa"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
-msgstr "Modo maximizado \"Inteligente\""
+msgstr "Modo de Maximizado \"Inteligente\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
-msgstr "Modo maximizar \"Expandido\""
+msgstr "Modo de Maximizado \"Expandir\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
-msgstr "Modo maximizado \"Llenar\""
+msgstr "Modo de Maximizado \"Llenar\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
-msgstr "Cambiar a modo sombra arriba"
+msgstr "Alternar a Modo de Sombra Arriba"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
-msgstr "Cambiar a modo sombra debajo"
+msgstr "Alternar a Modo de Sombra Abajo"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
-msgstr "Cambiar a modo sombra izquierda"
+msgstr "Alternar a Modo de Sombra a la Izquierda"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
-msgstr "Cambiar a modo sombra a derecha"
+msgstr "Alternar a Modo de Sombra a la Derecha"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
-msgstr "Cambiar el modo de la sombra"
+msgstr "Alternar a Modo de Sombra"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
-msgstr "Cambiar modo sin bordes"
+msgstr "Alternar a Estado Sin Bordes"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
-msgstr "Cambiar Estado de pinchado"
-
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+msgstr "Alternar a Estado Sujetado"
+
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
-msgstr "Voltear escritorio izquierda"
+msgstr "Voltear Escritorio al lado Izquierdo"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
-msgstr "Voltear el escritorio a la derecha"
+msgstr "Voltear Escritorio al lado Derecho"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
-msgstr "Voltear escritorio arriba"
+msgstr "Voltear Escritorio para Arriba"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
-msgstr "Voltear el escritorio abajo"
+msgstr "Voltear Escritorio para Abajo"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
-msgstr "Voltear el escritorio por..."
+msgstr "Voltear el Escritorio por..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
-msgstr "Mostrar escritorio"
+msgstr "Mostrar El Escritorio"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
-msgstr "Voltear el escritorio a..."
+msgstr "Voltear el Escritorio a..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
-msgstr "Voltear el escritorio linearmente..."
+msgstr "Voltear el escritorio linealmente..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
-msgstr "Ir al escritorio 0"
+msgstr "Cambiar Al Escritorio 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
-msgstr "Ir al escritorio 1"
+msgstr "Cambiar Al Escritorio 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
-msgstr "Ir al escritorio 2"
+msgstr "Cambiar Al Escritorio 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
-msgstr "Ir al escritorio 3"
+msgstr "Cambiar Al Escritorio 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
-msgstr "Ir al escritorio 4"
+msgstr "Cambiar Al Escritorio 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
-msgstr "Ir al escritorio 5"
+msgstr "Cambiar Al Escritorio 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
-msgstr "Ir al escritorio 6"
+msgstr "Cambiar Al Escritorio 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
-msgstr "Ir al escritorio 7"
+msgstr "Cambiar Al Escritorio 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
-msgstr "Ir al escritorio 8"
+msgstr "Cambiar Al Escritorio 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
-msgstr "Ir al escritorio 9"
+msgstr "Cambiar Al Escritorio 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
-msgstr "Ir al escritorio 10"
+msgstr "Cambiar Al Escritorio 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
-msgstr "Ir al escritorio 11"
+msgstr "Cambiar Al Escritorio 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
-msgstr "Ir al escritorio..."
+msgstr "Cambiar Al Escritorio..."
 
-#: src/bin/e_actions.c:2156
-#, fuzzy
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Voltear escritorio izquierda"
+msgstr "Voltear Escritorio Izquierda(Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2158
-#, fuzzy
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Voltear el escritorio a la derecha"
+msgstr "Voltear Escritorio Derecha(Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2160
-#, fuzzy
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Voltear escritorio arriba"
+msgstr "Voltear Escritorio Arriba(Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2162
-#, fuzzy
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Voltear el escritorio abajo"
+msgstr "Voltear Escritorio Abajo(Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2164
-#, fuzzy
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Voltear el escritorio por..."
+msgstr "Voltear Escritorio Por... (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2170
-#, fuzzy
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Voltear el escritorio a..."
+msgstr "Voltear Escritorio A... (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2176
-#, fuzzy
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Voltear el escritorio linearmente..."
+msgstr "Voltear Escritorio Linealmente... (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2182
-#, fuzzy
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Ir al escritorio 0"
+msgstr "Cambiar Al Escritorio 0 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2184
-#, fuzzy
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Ir al escritorio 1"
+msgstr "Cambiar Al Escritorio 1 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2186
-#, fuzzy
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Ir al escritorio 2"
+msgstr "Cambiar Al Escritorio 2 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2188
-#, fuzzy
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Ir al escritorio 3"
+msgstr "Cambiar Al Escritorio 3 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2190
-#, fuzzy
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Ir al escritorio 4"
+msgstr "Cambiar Al Escritorio 4 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2192
-#, fuzzy
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Ir al escritorio 5"
+msgstr "Cambiar Al Escritorio 5 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2194
-#, fuzzy
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Ir al escritorio 6"
+msgstr "Cambiar Al Escritorio 6 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2196
-#, fuzzy
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Ir al escritorio 7"
+msgstr "Cambiar Al Escritorio 7 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2198
-#, fuzzy
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Ir al escritorio 8"
+msgstr "Cambiar Al Escritorio 8 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2200
-#, fuzzy
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Ir al escritorio 9"
+msgstr "Cambiar Al Escritorio 9 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2202
-#, fuzzy
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Ir al escritorio 10"
+msgstr "Cambiar Al Escritorio 10 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2204
-#, fuzzy
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Ir al escritorio 11"
+msgstr "Cambiar Al Escritorio 11 (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2206
-#, fuzzy
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Ir al escritorio..."
+msgstr "Cambiar Al Escritorio... (Todas las Pantallas)"
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -473,136 +452,136 @@ msgstr "Ir al escritorio..."
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
-msgstr "Enviar mouse a pantalla 0"
+msgstr "Enviar Ratón a la Pantalla 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
-msgstr "Enviar mouse a pantalla 1"
+msgstr "Enviar Ratón a la Pantalla 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
-msgstr "Enviar mouse a pantalla..."
+msgstr "Enviar Ratón a la Pantalla..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
-msgstr "Enviar mouse una pantalla adelante"
+msgstr "Enviar Ratón Adelante 1 Pantalla"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
-msgstr "Enviar mouse una pantalla atrás"
+msgstr "Enviar Ratón Atrás 1 Pantalla"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
-msgstr "Enviar mouse adelante/atrás pantallas..."
+msgstr "Enviar Ratón Adelante/Atrás Pantallas..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Ventana : Moviendo"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
-msgstr "Al escritorio siguiente"
+msgstr "Al Escritorio Siguiente"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
-msgstr "Al escritorio anterior"
+msgstr "Al Escritorio Anterior"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
-msgstr "Por ecritorio #..."
+msgstr "Por Escritorio #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
-msgstr "Al escritorio..."
+msgstr "Al Escritorio..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
-msgstr "Mostrar el menú principal"
+msgstr "Mostrar el Menú Principal"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
-msgstr "Mostrar el menú favoritos"
+msgstr "Mostrar el Menú de Favoritos"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
-msgstr "Mostra menú Todas las aplicaciones"
+msgstr "Mostrar el Menú con Todas las aplicaciones"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
-msgstr "Mostrar el menú de clientes"
+msgstr "Mostrar el Menú de Clientes"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
-msgstr "Mostrar menú..."
+msgstr "Mostrar Menú..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Lanzar"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
-msgstr "Comando definido"
+msgstr "Comando Definido"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Aplicación"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Salir"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
-msgstr "Salir"
+msgstr "Desconectarse"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
-msgstr "Salir inmediátamente"
+msgstr "Salir Inmediatamente"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Apagar"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
-msgstr "Suspender al disco"
+msgstr "Suspender a Disco"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
-msgstr "Bloquear escritorio"
+msgstr "Bloquear Escritorio"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Reordenar ventanas"
 
@@ -610,11 +589,11 @@ msgstr "Reordenar ventanas"
 msgid "Set As Background"
 msgstr "Elegir como fondo de pantalla"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
-msgstr "Terminado el registro de archivos en el Escritorio"
+msgstr "Exploración de archivos de Escritorio listo"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Examinar archivos del escritorio"
 
@@ -629,11 +608,13 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 "Los datos de configuración necesitan ser actualizados. Tu<br>configuración "
-"antigua ha sido eliminada y se han establecido<br>valores por defecto. Esto "
-"ocurrirá frecuentemente durante el<br>desarrollo, no reportes un bug. Esto "
-"es necesario porque<br>a veces los datos de configuración se modifican y la "
-"antigua<br>configuración no es compatible. Ahora puedes reconfigurarlo<br>a "
-"tu gusto. Lo sentimos por las molestias.<br>"
+"antigua ha sido eliminada y se han establecido<br>nuevos valores por defecto."
+"Esto ocurrirá frecuentemente durante el<br>desarrollo, así que, no reporte "
+"un error. Esto significa que Enlightenment necesita nuevos datos "
+"de<br>configuración por defecto para lograr utilizar funcionalidad que<br>su "
+"antigua configuración simplemente no tiene.Esto<br>se soluciona al agregarle "
+"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_config.c:607
 msgid ""
@@ -643,35 +624,35 @@ msgid ""
 "running. This is bad and<br>as a precaution your configuration has been now "
 "restored to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Tu configuración es más MODERNA que Enlightenment. Esto es muy<br>extraño. "
-"No deberia ocurrir a menos que desactualices<br>Enlightenment o hayas "
+"Tu configuración es más RECIENTE que Enlightenment. Esto es muy<br>extraño. "
+"No debería ocurrir a menos que usted rebajara<br>Enlightenment o hayas "
 "copiado la configuración de un sitio donde<br>está instalada una versión de "
-"Enlightenment más moderna. Esto es malo<br>y como precaución tu "
-"configuración se ha reestablecido a los<br>valores por defecto. Lo sentimos "
-"por las molestias<br>"
+"más reciente de Enlightenment. Esto es malo<br>y como precaución su "
+"configuración se ha restablecido a los<br>valores por defecto. Sentimos por "
+"las molestias<br>"
 
 #: src/bin/e_config.c:629
 #, c-format
 msgid "Desktop %i, %i"
 msgstr "Escritorio %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
-msgstr "Configuración actualizada"
+msgstr "Configuración Actualizada"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
 "error could not be<br>deterimined.<br><br>The file where the error occured "
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Hubo un error cuando se guardad la configuración<br>de Enlightenment en el "
-"disco. El error no pudo ser <br>determinado.<br><br>El archivo donde ocurrió "
-"el error fue:<br>%s<br><br>El archivo fue borrado para evitar datos erróneos."
-"<br>"
+"Ocurrió un error mientras se guardad la configuración<br>de Enlightenment en "
+"el disco. El error no pudo ser <br>determinado.<br><br>El archivo donde "
+"ocurrió el error fue:<br>%s<br><br>El archivo fue borrado para evitar "
+"corrupción de datos.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -684,10 +665,10 @@ msgstr ""
 "sistema de archivos donde están siendo guardados.<br>Este error es muy raro "
 "porque los archivos deberían ser <br>extremadamente pequeños. Verifique la "
 "configuración<br>de su directorio home.<br><br>El archivo donde ocurrió el "
-"error fue:<br>%s<br><br>Este archivo fue borrado para evitar datos erróneos."
-"<br>"
+"error fue:<br>%s<br><br>Este archivo fue borrado para evitar la corrupción "
+"de los datos.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -695,12 +676,13 @@ msgid ""
 "replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Ocurrió un error de salida cuando se escribian los archivos de "
+"Ocurrió un error de salida cuando se escribían los archivos de "
 "configuración<br>para Enlightenment. Su disco está teniendo problemas<br>y "
 "posiblemente necesite cambiarlo.<br><br>El archivo donde ocurrió el error "
-"fue:<br>%s<br><br>El archivo fue borrado para evitar datos erróneos.<br>"
+"fue:<br>%s<br><br>El archivo fue borrado para evitar la corrupción de datos."
+"<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -709,34 +691,33 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 "Enlightenment no puede escribir su archivo de configuración<br>porque se "
-"quedó sin espacio para escribir el archivo.<br>Puede haberse quedado sin "
+"quedó sin espacio para escribir el archivo.<br>Pudo haberse quedado sin "
 "espacio en el disco o<br>haber superado su límite de cuota.<br><br>El "
 "archivo donde ocurrió el error fue:<br>%s<br><br>El archivo fue borrado para "
-"evitar datos erróneos.<br>"
+"evitar la corrupción de los datos.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
 "closed on it. This is very unusual.<br><br>The file where the error occured "
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Inesperadamente, el archivo donde Enlightenment  tiene la "
-"configuración<br>no puede ser escrito/modificado. Estos es muy raro."
-"<br><br>El archivo donde ocurrió esto es:<br>%s<br><br>El archivo fue "
-"borrado para evitar datos erróneos.<br>"
+"A Enlightenment inesperadamente,se le cerro el archivo <br>donde estaba "
+"escribiendo la configuración. Esto es muy raro.<br><br>El archivo donde "
+"ocurrió el error es:<br>%s<br><br>El archivo fue borrado para evitar datos "
+"erróneos.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problemas en la escritura de la configuración de Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -745,19 +726,20 @@ msgstr "Problemas en la escritura de la configuración de Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "Ok"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -773,21 +755,21 @@ msgstr "Aplicar"
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Módulos"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Contenedor %d"
 
 #: src/bin/e_desklock.c:143
 msgid "Error - no PAM support"
-msgstr "Error - no hay soporte de PAM"
+msgstr "Error - no hay soporte para PAM"
 
 #: src/bin/e_desklock.c:144
 msgid ""
@@ -839,9 +821,9 @@ 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 ""
-"La ventana para la que está creando un ícono<br>no tiene una propiedad dde "
+"La ventana para la que está creando un icono<br>no tiene una propiedad dde "
 "nombre de ventana<br>y clase, así que las propiedades necesarias para "
-"que<br>el ícono sea usado para esta ventana<br>no pueden ser adivinados. "
+"que<br>el icono sea usado para esta ventana<br>no pueden ser adivinados. "
 "Deberá usar<br>el título de la ventana en su lugar. Esto sólo <br>funcionará "
 "si el título de la ventana es el mismo<br>en el momento en que se inicia y "
 "no <br>cambia."
@@ -851,10 +833,10 @@ msgid "Desktop Entry Editor"
 msgstr "Editor de entrada de Escritorio"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
-msgstr "ícono"
+msgstr "Icono"
 
 #: src/bin/e_eap_editor.c:455
 #: src/modules/conf_mime/e_int_config_mime_edit.c:136
@@ -887,20 +869,18 @@ msgstr "Nombre genérico"
 msgid "Window Class"
 msgstr "Clase de la ventana"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Categorías"
 
 #: src/bin/e_eap_editor.c:511
-#, fuzzy
 msgid "Mime Types"
-msgstr "Tipos de archivos"
+msgstr "Tipos Mime"
 
 #: src/bin/e_eap_editor.c:517
-#, fuzzy
 msgid "Options"
-msgstr "Opciones de llenado"
+msgstr "Opciones"
 
 #: src/bin/e_eap_editor.c:518
 msgid "Startup Notify"
@@ -924,7 +904,7 @@ msgstr "Nombre de archivo"
 
 #: src/bin/e_eap_editor.c:556
 msgid "Select an Icon"
-msgstr "Elegir un ícono"
+msgstr "Elegir un icono"
 
 #: src/bin/e_eap_editor.c:598 src/bin/e_eap_editor.c:662
 #: src/bin/e_entry_dialog.c:59 src/bin/e_fm_prop.c:514
@@ -934,6 +914,7 @@ msgstr "Elegir un ícono"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -941,7 +922,7 @@ msgstr "Cancelar"
 msgid "Select an Executable"
 msgstr "Elegir ejecutable"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -949,15 +930,15 @@ msgstr "Elegir ejecutable"
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Pegar"
 
@@ -965,24 +946,24 @@ msgstr "Pegar"
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Error de ejecución"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Error de ejecución de aplicación"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -991,194 +972,195 @@ msgstr ""
 "Enlightenment no puedo ejecutar la aplicación:<br><br>%s<br><br>La "
 "aplicación falló al iniciarse."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
-msgstr "Error de ejecución de la aplicación"
+msgstr "Error en ejecución de la aplicación"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s dejó de funcionar inesperádamente."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Un código de salida de %i fue regresado desde %s."
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, 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:434
+#: src/bin/e_exec.c:439
 #, 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:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s fue interrumpido por una señal de Abortar."
+msgstr "%s fue interrumpido por una señal de abortar."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
-msgstr "%s fue interrumpido por un error de Punto flotante."
+msgstr "%s fue interrumpido por un error de punto flotante."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
-msgstr "%s fue interrumpido por una señal de Matar ininterrumpible."
+msgstr "%s fue interrumpido por una señal de matar ininterrumpible."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, 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:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s fue interrumpido por una tubería rota."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, 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:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s fue interrumpido por un error de Bus."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, 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:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Informe de errores"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "No hubo mensaje de error"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Guardar el mensaje"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Información de error"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Información de señal de error"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Información de salida"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "No hubo salida"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "No existe la ruta"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s no existe"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i archivos"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Modo de vista"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Actualizar vista"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Mostrar archivos ocultos"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Recordar orden"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Ordenar ahora"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nuevo directorio"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
-msgstr "Íconos"
+msgstr "Iconos"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Crear un nuevo directorio"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nombre del nuevo directorio:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renombrar %s a:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Renombrar archivo"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Confirmar borrado"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "¿Está seguro de querer borrar <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1232,7 +1214,7 @@ msgid "Owner can write"
 msgstr "El propietario puede modificar"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1255,7 +1237,7 @@ msgstr "Modificado"
 
 #: src/bin/e_fm_prop.c:448
 msgid "Use this icon for all files of this type"
-msgstr "Usar este ícono para los archivos de este tipo"
+msgstr "Usar este icono para los archivos de este tipo"
 
 #: src/bin/e_fm_prop.c:456
 msgid "Link Information"
@@ -1265,49 +1247,49 @@ msgstr "Información del enlace"
 msgid "Select an Image"
 msgstr "Elija una imagen"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volumen desconocido"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Dispositivo removible"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Recorte"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1321,27 +1303,27 @@ msgstr "Recorte"
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Desplazar el contenido automáticamente"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Posible de cambiar tamaño"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Comenzar mover/cambiar tamaño del dispositivo"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Borrar este dispositivo"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/cambiar tamaño del dispositivo"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1360,7 +1342,7 @@ msgstr "¿Quiere deshabilitar esta pantalla en el futuro?"
 
 #: src/bin/e_init.c:558
 msgid "Theme Bug Detected"
-msgstr "Bug en el Tema detectado"
+msgstr "Error detectado en el tema"
 
 #: src/bin/e_init.c:559
 msgid ""
@@ -1372,7 +1354,7 @@ msgstr ""
 "las señales cuando<br>el inicio se ha terminado. Debe usar un tema de "
 "pantalla de inicio<br>que trabaje bien o arreglar<br>el que usa."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Bloquear ventana"
 
@@ -1407,21 +1389,21 @@ msgid "Lock program changing:"
 msgstr "Cambiando el bloqueo del programa:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Posición"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Tamaño"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Apilamiento"
 
@@ -1430,12 +1412,12 @@ msgid "Iconified state"
 msgstr "Estado minimizado"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Fijación"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Estado de fijación"
 
@@ -1451,7 +1433,7 @@ msgstr "Estado de pantalla completa"
 msgid "Lock me from changing:"
 msgstr "Bloquearme de cambios:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Estilo del borde"
 
@@ -1471,126 +1453,126 @@ msgstr "Saliendo al login con esta ventana abierta"
 msgid "Remember these Locks"
 msgstr "Recordar estos bloqueos"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Siempre arriba"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Siempre debajo"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maximizado vertical"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maximizado horizontal"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Recordar"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Borde"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Enviar al escritorio"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Pegar al escritorio"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Despegar del escritorio"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Estado"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Saltear"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
-msgstr "Editar ícono"
+msgstr "Editar icono"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Agregar al menú favoritos"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Agregar un atajo de teclado"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Agregar al Lanzador"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
-msgstr "Crear ícono"
+msgstr "Crear icono"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propiedades de ventana"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Minimizar"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Elegir estilo del borde"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
-msgstr "Usar las prefencias de Íconos de e17 de forma predeterminada"
+msgstr "Usar las preferencias de iconos de e17 de forma predeterminada"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
-msgstr "Usar ícono de la aplicación"
+msgstr "Usar icono de la aplicación"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
-msgstr "Usar los ïconos definidos por el usuario"
+msgstr "Usar los iconos definidos por el usuario"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Enrollar"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Escritorio fijo"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista de ventanas"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1599,6 +1581,11 @@ msgstr "Lista de ventanas"
 msgid "Pager"
 msgstr "Paginador"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Saltear la barra de tareas"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1611,7 +1598,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propiedades ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Título"
 
@@ -1621,7 +1608,7 @@ msgstr "Clase"
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
 msgid "Icon Name"
-msgstr "Nombre del ícono"
+msgstr "Nombre del icono"
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
@@ -1707,11 +1694,11 @@ msgstr "Propiedades NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Saltear la barra de tareas"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Saltear paginador"
 
@@ -1719,15 +1706,15 @@ msgstr "Saltear paginador"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Recordar ventana"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Las propiedades de la ventana no son únicas"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1752,11 +1739,11 @@ msgstr ""
 "configuración será aceptada. Presione <hilight>Cancelar</hilight> si "
 "no<br>está seguro y nada será afectado."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
-msgstr "No hay propiedades similares"
+msgstr "No hay un conjunto de propiedades similares"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1768,7 +1755,7 @@ msgstr ""
 "especificar como recordarlo</hilight>.<br><br>Debe especificar al menos una "
 "forma de recordar para esta ventana."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1798,118 +1785,118 @@ msgstr ""
 "<hilight>Ok</hilight><br>y su configuración serán aceptadas. Oprima "
 "<hilight>Cancelar</hilight> si<br>no está seguro y nada será afectado."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Tamaño y posición"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Bloqueos"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Tamaño, posición y bloqueos"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Todo"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Recordar usos"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nombre y clase de la ventana"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Rol de la ventana"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Tipo de ventana"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Tiempo"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Propiedades para recordar"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
-msgstr "Preferencia de íconos"
+msgstr "Preferencia de iconos"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Escritorios virtuales"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Pantalla actual"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Omitir de la lista de ventanas"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Coincidir sólo una ventana"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Iniciar este programa al identificarse"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
-msgstr ""
+msgstr "Siempre enfocar al iniciar"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configuración"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Administrador de archivos"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "Contenedor"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Opciones de módulo"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Módulos disponibles"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Carga módulo"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Módulos cargados"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Descargar módulo"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1974,10 +1961,12 @@ msgstr "Aplicaciones favoritas"
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2003,52 +1992,52 @@ msgstr "Contenedor"
 msgid "Show/Hide All Windows"
 msgstr "Mostrar/Esconder todas las ventanas"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Sin aplicaciones)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configurar escritorios virtuales"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Bloquear pantalla"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Salir"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Sin ventanas)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Ventanas perdidas"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "¡¡Sin nombre!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Sin contenedores)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Contenedor #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Agregar un contenedor"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Borrar un contenedor"
 
@@ -2057,13 +2046,13 @@ msgid "Shelf Configuration"
 msgstr "Configuración del contenedor"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Pequeño"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Chico"
 
@@ -2072,12 +2061,12 @@ msgid "Medium"
 msgstr "Medio"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "ancho"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grande"
 
@@ -2115,7 +2104,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Estilos"
 
@@ -2170,7 +2159,7 @@ msgstr ""
 "ya existe, PERO tiene permisos\n"
 "que son muy permisivos (solo el propietario debe\n"
 "poder leerlo y escribirlo, nadie más)\n"
-"o usted no es el dueño. Revise:\n"
+"o usted no es el dueño. Por favor revise:\n"
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:62
@@ -2183,7 +2172,7 @@ msgid ""
 msgstr ""
 "El directorio del socket IPC no puede ser creado o\n"
 "examinado.\n"
-"Verifique:\n"
+"Por favor verifique:\n"
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:250
@@ -2238,7 +2227,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar Ecore!\n"
-"Quizá no tiene la memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:336
 msgid ""
@@ -2246,7 +2235,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no uede iniciar el sistema de archivos.\n"
-"Quizá no tiene la memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:348
 msgid ""
@@ -2254,7 +2243,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede elegir un manejador de la señal de salida.\n"
-"Quizá no tiene la memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:354
 msgid ""
@@ -2262,7 +2251,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar el manejador de la señal HUP.\n"
-"Quizá no tiene la memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:366
 msgid ""
@@ -2286,7 +2275,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar el sistema de conexiones.\n"
-"Quizá no haya memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:405
 msgid ""
@@ -2294,7 +2283,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar el sistema IPC.\n"
-"Quizá no haya memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:414
 msgid ""
@@ -2302,7 +2291,7 @@ msgid ""
 "This should not happen."
 msgstr ""
 "Enlightenment no puede iniciar xinerama.\n"
-"Esto no deberia ocurrir."
+"Esto no debería ocurrir."
 
 #: src/bin/e_main.c:436
 msgid ""
@@ -2310,7 +2299,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar el sistema Evas.\n"
-"Quizá no haya memoria suficiente"
+"¿Quizá no tiene memoria suficiente?"
 
 #: src/bin/e_main.c:442
 msgid ""
@@ -2368,7 +2357,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede establecer caminos para encontrar archivos.\n"
-"Quizá no tenga memoria suficiente"
+"¿Tiene la memoria suficiente?"
 
 #: src/bin/e_main.c:537
 msgid "Enlightenment cannot set up its font system."
@@ -2384,7 +2373,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment no puede iniciar su pantalla de inicio.\n"
-"Quizá no tenga memoria suficiente"
+"¿Tiene la memoria suficiente?"
 
 #: src/bin/e_main.c:570
 msgid "Testing Format Support"
@@ -2622,14 +2611,12 @@ 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:865
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "Elegir política de energía del CPU"
+msgstr "Configurar modos de ahorro de energía"
 
 #: src/bin/e_main.c:869
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment no puede iniciar su sitema de ventanas emergentes"
+msgstr "Enlightenment no puede configurar los modos de ahorro de energía"
 
 #: src/bin/e_main.c:901
 msgid "Load Modules"
@@ -2669,9 +2656,9 @@ msgstr "Configurar contenedores"
 
 #: src/bin/e_main.c:932
 msgid "Almost Done"
-msgstr "Casi hecho"
+msgstr "Casi terminado"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2680,11 +2667,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Error cargando un Módulo"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2696,11 +2683,11 @@ msgstr ""
 "El error producido fué:\n"
 "%s"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Los módulos no contienen todas las funciones necesarias"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2711,12 +2698,12 @@ 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:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s de Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "¿Quiere deshabilitar este módulo?"
 
@@ -2949,32 +2936,32 @@ msgstr "En el último minuto"
 #: src/bin/e_utils.c:777
 #, c-format
 msgid "%li Years ago"
-msgstr "%li años antes"
+msgstr "hace %li años"
 
 #: src/bin/e_utils.c:779
 #, c-format
 msgid "%li Months ago"
-msgstr "%li meses antes"
+msgstr "hace %li meses"
 
 #: src/bin/e_utils.c:781
 #, c-format
 msgid "%li Weeks ago"
-msgstr "%li semanas antes"
+msgstr "hace %li semanas"
 
 #: src/bin/e_utils.c:783
 #, c-format
 msgid "%li Days ago"
-msgstr "%li días antes"
+msgstr "hace %li días"
 
 #: src/bin/e_utils.c:785
 #, c-format
 msgid "%li Hours ago"
-msgstr "%li horas antes"
+msgstr "hace %li horas"
 
 #: src/bin/e_utils.c:787
 #, c-format
 msgid "%li Minutes ago"
-msgstr "%li minutos antes"
+msgstr "hace %li minutos"
 
 #: src/bin/e_utils.c:793
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1146
@@ -3011,9 +2998,9 @@ msgstr "Agregar a favoritos"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Subir un directorio"
 
@@ -3050,39 +3037,39 @@ msgstr "Prohibido"
 msgid "Read-Write"
 msgstr "Lectura-Escritura"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configuración del monitor de batería"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta cuando la batería esté baja"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Configuraciones avanzadas"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Verificar la batería cada:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
-#, fuzzy, c-format
+#: src/modules/temperature/e_mod_config.c:380
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f archivos"
+msgstr "%1.0f ticks"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
-msgstr "Alerta cuando la batería esté a:"
+msgstr "Alertar cuando la batería esté en:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3093,71 +3080,51 @@ msgstr "Alerta cuando la batería esté a:"
 msgid "%1.0f minutes"
 msgstr "%1.0f minutos"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f por ciento"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Batería"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"La batería está baja<br>Su batería está baja.<br>Quizá quiera cambiar a una "
-"fuente AC."
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "Mal driver"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "Llena"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Alta"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Baja"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Peligro"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f segundos"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Cargando"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Batería"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 msgid "Battery Meter"
 msgstr "Medidor de batería"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr "N/D"
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Reloj"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configuración de Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Elementos"
 
@@ -3188,14 +3155,13 @@ msgid "Restart Applications"
 msgstr "Reiniciar aplicaciones"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Todas las aplicaciones"
 
 #: src/modules/conf_applications/e_int_config_apps.c:252
-#, fuzzy
 msgid "Selected Applications"
-msgstr "Aplicaciones específicas"
+msgstr "Aplicaciones Seleccionadas"
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
@@ -3246,7 +3212,7 @@ msgstr "Agrupar por"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3348,7 +3314,7 @@ msgid "Error Text"
 msgstr "Error de texto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Título del menú"
 
@@ -3357,7 +3323,7 @@ msgid "Menu Title Active"
 msgstr "Título del menú activo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Elemento del menú"
 
@@ -3366,12 +3332,12 @@ msgid "Menu Item Active"
 msgstr "Elemento del menú activo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Mover texto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Redimensionar texto"
 
@@ -3384,12 +3350,12 @@ msgid "Winlist Label"
 msgstr "Etiqueta de elemento de ventana"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Título de la lista de ventanas"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Dispositivos"
 
@@ -3426,7 +3392,7 @@ msgid "List Item Odd Text"
 msgstr "Texto de elemento de lista impar"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Encabezado de lista"
 
@@ -3512,6 +3478,7 @@ msgstr "Nombre del ecritorio"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -3553,10 +3520,10 @@ msgstr "Tiempo de espera para exceder"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Personal"
 
@@ -3895,17 +3862,19 @@ msgstr "Habilitar Composite"
 msgid "Default Engine"
 msgstr "Motor predeterminado"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
-#, fuzzy
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
-msgstr "Habilitar Composite"
+msgstr "¿ Habilitar Soporte para Video Compuesto ?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"Usted ha escogido habilitar soporte para video compuesto,<br>pero su "
+"pantalla nosoporta video compuesto.<br><br>¿ Esta seguro de querer habilitar "
+"soporte paravideo compuesto ?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4024,206 +3993,211 @@ msgstr "Alineación al eje Y"
 msgid "Run Command"
 msgstr "Ejecutar"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Núcleo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Barra de título"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Bloque de texto plano"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Bloque de texto resaltado"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Bloque de texto grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Configurar encabezamiento"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Título de Acerca"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Sobre la versión"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Texto de Acerca"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Título del bloqueador de escritorio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Contraseña del bloqueador de teclado"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Diálogo de error"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Ejecutar Exebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Título de inicio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Texto de inicio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Versión del inicio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Marco"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Botones"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Deslizador"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Botones de radio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Botones de chequeo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Elementos de lista de texto"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Elemento de lista"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Administrador de archivos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Mostrar los iconos del escritorio"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Estilo pequeño"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Estilo normal"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Estilo grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Opciones de fuente"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Realmente grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Habilitar clases de fuentes personalizadas"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Previsualización básica de texto: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Clases de fuentes"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Habilitar clases de fuente"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Sugiriendo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Fuentes de apoyo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Nombre del apoyo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Habilitar apoyos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Previsualización avanzada de texto.. 我真的会写中文"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:54
 msgid "Icon Theme Settings"
-msgstr "Opciones de tema de íconos"
+msgstr "Opciones de tema de iconos"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:279
 msgid "Icon Themes"
-msgstr "Temas de íconos"
+msgstr "Temas de iconos"
 
 #: src/modules/conf_icon_theme/e_mod_main.c:35
 msgid "Icon Theme"
-msgstr "Tema de ícono"
+msgstr "Tema de icono"
 
 #: src/modules/conf_imc/e_int_config_imc.c:109
 msgid "Input Method Configuration"
@@ -4248,7 +4222,7 @@ msgid "New"
 msgstr "Nuevo"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importar..."
 
@@ -4299,22 +4273,64 @@ msgstr "Idioma"
 msgid "Input Method Settings"
 msgstr "Configuración del método de entrada"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Opciones de selección"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixels"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pixels/seg"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.f seg"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interna"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configuración del idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Selector de idioma"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Idioma elegido"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Idioma"
 
@@ -4528,7 +4544,7 @@ msgstr "Usar miniatura generada"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:150
 msgid "Use Theme Icon"
-msgstr "Usar ícono del tema"
+msgstr "Usar icono del tema"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:153
 msgid "Use Edje File"
@@ -4633,11 +4649,6 @@ msgstr "Usar cursor X"
 msgid "Cursor Size"
 msgstr "Tamaño del cursor"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixels"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Cursor del mouse"
@@ -4672,7 +4683,7 @@ msgid "Images"
 msgstr "Imágenes"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Temas"
 
@@ -4829,11 +4840,6 @@ msgstr "Tiempo hasta que arranque el salvapantallas de X"
 msgid "Time until X screensaver alternates"
 msgstr "Tiempo hasta que alterne el salvapantallas de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segundos"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Vaciando"
@@ -4891,23 +4897,23 @@ msgstr "Mostrar pantalla de inicio al entrar"
 msgid "Startup"
 msgstr "Inicio"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Selector de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Categoría de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Asignar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Limpiar todo"
 
@@ -4953,38 +4959,43 @@ msgstr "Cambio de fondo de pantalla"
 msgid "Transitions"
 msgstr "Transiciones"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Opciones de fondo de pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Usar el fondo de pantalla del tema"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Imagen..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Gradiente..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Donde ubicar el fondo de pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Todos los escritorios"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Este escritorio"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Esta pantalla"
 
@@ -5034,7 +5045,7 @@ msgstr "Error en la creación del gradiente"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Por alguna razón, Enlightenment no pudo crear el gradiente."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Elija una imagen..."
 
@@ -5086,19 +5097,19 @@ msgstr ""
 "Enlightenment no pudo importar la imagen<br>porque hubo errores de "
 "conversión."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Error importando el fondo de pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5106,6 +5117,63 @@ msgstr ""
 "Enlightenment no pudo importar el fondo de pantalla.<br><br>¿Está seguro de "
 "que es un fondo de pantalla válido?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5211,7 +5279,7 @@ msgstr "Ícono definido por el usuario"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:247
 msgid "Prefer application provided icon"
-msgstr "Preferir el ícono proveído por la aplicación"
+msgstr "Preferir el icono proveído por la aplicación"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:251
 msgid "Internal Windows"
@@ -5300,7 +5368,7 @@ msgstr "Revertir el foco cuando se esconde o cierra una ventana"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:216
 msgid "Slide pointer to a new focused window"
-msgstr ""
+msgstr "Deslizar el apuntador a una nueva ventana focalizada"
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 msgid "Window Focus"
@@ -5399,6 +5467,62 @@ msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Mover/redimensionar ventanas automáticamente cuando se esconda el contenedor"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Recordar ventana"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Configuración de memoria"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Predeterminados"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nombre del icono"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Clase"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Clase del ícono"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Título"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Título"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Rol"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Ninguno>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Opciones de la lista de ventanas"
@@ -5472,29 +5596,24 @@ msgid "Cpufreq"
 msgstr "Frecuencia del CPU"
 
 #: src/modules/cpufreq/e_mod_main.c:177
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Rápido (0.5 seg)"
+msgstr "Rápido (0.01 segundos)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Medio (1 seg)"
+msgstr "Medio (0.08 segundos)"
 
 #: src/modules/cpufreq/e_mod_main.c:191
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normal (2 seg)"
+msgstr "Normal (0.32 segundos)"
 
 #: src/modules/cpufreq/e_mod_main.c:198
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Lento (5 seg)"
+msgstr "Lento (0.64 segundos)"
 
 #: src/modules/cpufreq/e_mod_main.c:205
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Muy lento (30 seg)"
+msgstr "Muy lento (2.56 segundos)"
 
 #: src/modules/cpufreq/e_mod_main.c:220
 msgid "Manual"
@@ -5675,13 +5794,15 @@ msgid ""
 "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 ""
-"Los datos de configuración del módulo de Archivos necesitan ser "
-"actualizados. Tu<br>configuración antigua ha sido eliminada y se han "
-"establecido<br>valores por defecto. Esto ocurrirá frecuentemente durante "
-"el<br>desarrollo, no reportes un bug. Esto es necesario porque<br>a veces "
-"los datos de configuración se modifican y la antigua<br>configuración no es "
-"compatible. Ahora puedes reconfigurarlo<br>a tu gusto. Lo sentimos por las "
-"molestias.<br>"
+"Los datos de Configuración del Módulo Fielman necesitan ser actualizados. "
+"Su<br>configuración anterior ha sido eliminada y se han establecido nuevos "
+"valores predefinidos. Esto<br>ocurrirá frecuentemente durante el desarrollo, "
+"así que, no reporte <br>errores. Esto solo significa que el módulo Fileman "
+"necesita nuevos datos<br>de configuración por defecto para funcionalidad "
+"utilizable que su configuración<br>vieja simplemente no posee. Estos nuevos "
+"valores predefinidos repararan<br>eso al agregarlo en el. Usted puede "
+"reconfigurar ahora a su<br>gusto. Lamentamos el cambio en su configuración."
+"<br>"
 
 #: src/modules/fileman/e_mod_main.c:274
 msgid ""
@@ -5692,16 +5813,16 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Tu configuración del módulo de Archivos es más MODERNA que Enlightenment. "
-"Esto es muy<br>extraño. No deberia ocurrir a menos que "
-"desactualices<br>Enlightenment o hayas copiado la configuración de un sitio "
-"donde<br>está instalada una versión de Enlightenment más moderna. Esto es "
-"malo<br>y como precaución tu configuración se ha reestablecido a "
-"los<br>valores por defecto. Lo sentimos por las molestias<br>"
+"Su configuración del Módulo Fileman es más MUEVA que la version del Módulo "
+"Fileman. Esto es muy<br>extraño. Esto no debería ocurrir a menos que usted "
+"des-actualizara<br>el Módulo Fileman o haya copiado la configuración de un "
+"sitio donde<br>una versión mas nueva del Módulo Fileman se estaba "
+"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:343
 msgid "Fileman Configuration Updated"
-msgstr "Configuración del módulo de Archivos actualizada"
+msgstr "Configuración de Fileman actualizada"
 
 #: src/modules/fileman/e_mod_config.c:82
 msgid "Fileman Settings"
@@ -5709,23 +5830,23 @@ msgstr "Configuraciones del módulo de Archivos"
 
 #: src/modules/fileman/e_mod_config.c:159
 msgid "Grid Icons"
-msgstr "íconos de grilla"
+msgstr "iconos de malla"
 
 #: src/modules/fileman/e_mod_config.c:161
 msgid "Custom Icons"
-msgstr "Íconos personalizados"
+msgstr "Iconos personalizados"
 
 #: src/modules/fileman/e_mod_config.c:163
 msgid "Custom Grid Icons"
-msgstr "Íconos de grilla personalizados"
+msgstr "Iconos de malla personalizados"
 
 #: src/modules/fileman/e_mod_config.c:166
 msgid "Custom Smart Grid Icons"
-msgstr "Íconos de grilla ineligente propia"
+msgstr "Iconos de malla inteligentes personalizados"
 
 #: src/modules/fileman/e_mod_config.c:173
 msgid "Icon Size"
-msgstr "Tamaño del ícono"
+msgstr "Tamaño del icono"
 
 #: src/modules/fileman/e_mod_config.c:179
 msgid "Open Dirs In Place"
@@ -5737,11 +5858,11 @@ msgstr "Ordenar directorios antes"
 
 #: src/modules/fileman/e_mod_config.c:185
 msgid "Use Single Click"
-msgstr "Usar sólo un clic"
+msgstr "Usar clic sencillo"
 
 #: src/modules/fileman/e_mod_config.c:188
 msgid "Show Icon Extension"
-msgstr "Mostrar la extensión del ícono"
+msgstr "Mostrar la extensión del icono"
 
 #: src/modules/fileman/e_mod_config.c:191
 msgid "Show Full Path"
@@ -5749,7 +5870,7 @@ msgstr "Mostrar la ruta completa"
 
 #: src/modules/fileman/e_mod_config.c:194
 msgid "Show Desktop Icons"
-msgstr "Mostrar íconos del escritorio"
+msgstr "Mostrar los iconos del escritorio"
 
 #: src/modules/fileman/e_mod_config.c:197
 msgid "Show Toolbar"
@@ -5757,24 +5878,23 @@ msgstr "Mostrar barra de herramientas"
 
 #: src/modules/fileman/e_fwin.c:654
 msgid "Go to Parent Directory"
-msgstr "Ir al directorio de arriba"
+msgstr "Ir al Directorio Padre"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Aplicaciones específicas"
 
-#: src/modules/fileman/e_fwin.c:1394
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
-msgstr "Ejecutar"
+msgstr "Comando Personalizado"
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:50
 #: src/modules/winlist/e_mod_main.c:63 src/modules/winlist/e_mod_main.c:64
@@ -5787,7 +5907,7 @@ msgstr "Próxima ventana"
 
 #: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
 msgid "Previous Window"
-msgstr "Ventanas anterior"
+msgstr "Ventana anterior"
 
 #: src/modules/winlist/e_winlist.c:141
 msgid "Select a window"
@@ -5795,7 +5915,7 @@ msgstr "Elija una ventana"
 
 #: src/modules/ibar/e_mod_config.c:55
 msgid "IBar Configuration"
-msgstr "Configuración del iBar"
+msgstr "Configuración del IBar"
 
 #: src/modules/ibar/e_mod_config.c:101
 msgid "Selected Bar Source"
@@ -5803,11 +5923,11 @@ msgstr "Fuente de la barra seleccionada"
 
 #: src/modules/ibar/e_mod_config.c:122
 msgid "Icon Labels"
-msgstr "Etiquetas del ícono"
+msgstr "Etiquetas del icono"
 
 #: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:94
 msgid "Show Icon Label"
-msgstr "Mostrar etiqueta del ícono"
+msgstr "Mostrar etiqueta del icono"
 
 #: src/modules/ibar/e_mod_config.c:129
 msgid "Display App Name"
@@ -5823,7 +5943,7 @@ msgstr "Mostrar aplicación genérica"
 
 #: src/modules/ibar/e_mod_config.c:167
 msgid "Create new IBar source"
-msgstr "Crer una nueva iBar"
+msgstr "Crear una nueva fuente IBar"
 
 #: src/modules/ibar/e_mod_config.c:168
 msgid "Enter a name for this new source:"
@@ -5834,7 +5954,9 @@ msgstr "Ingrese un nombre para esta nueva fuente:"
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
-msgstr "Quiso borrar \"%s\".<br><br>¿Está seguro de querer borrar esta fuente?"
+msgstr ""
+"Quiso borrar \"%s\".<br><br>¿Está seguro de querer borrar la fuente deesta "
+"barra?"
 
 #: src/modules/ibar/e_mod_config.c:187
 msgid "Are you sure you want to delete this bar source?"
@@ -5846,25 +5968,23 @@ msgstr "IBar"
 
 #: src/modules/ibar/e_mod_main.c:799
 msgid "Change Icon Properties"
-msgstr "Cambiar propiedades del ícono"
+msgstr "Cambiar propiedades del icono"
 
 #: src/modules/ibar/e_mod_main.c:804
 msgid "Remove Icon"
-msgstr "Remover ícono"
+msgstr "Remover icono"
 
 #: src/modules/ibar/e_mod_main.c:814
-#, fuzzy
 msgid "Add An Icon"
-msgstr "Añadir aplicación"
+msgstr "Añadir Un Icono"
 
 #: src/modules/ibar/e_mod_main.c:821
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Crear ícono"
+msgstr "Crear Un Icono Nuevo"
 
 #: src/modules/ibar/e_mod_main.c:837
 msgid "Add Application"
-msgstr "Añadir aplicación"
+msgstr "Añadir Aplicación"
 
 #: src/modules/ibox/e_mod_config.c:48
 msgid "IBox Configuration"
@@ -5884,12 +6004,11 @@ msgstr "Mostrar clase"
 
 #: src/modules/ibox/e_mod_config.c:103
 msgid "Display Icon Name"
-msgstr "Mostrar nombre del ícono"
+msgstr "Mostrar nombre del icono"
 
 #: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Mostrar información"
+msgstr "Mostrar Información del Borde"
 
 #: src/modules/ibox/e_mod_config.c:130
 msgid "Show windows from all screens"
@@ -5920,49 +6039,43 @@ msgid "Flip desktop on mouse wheel"
 msgstr "Cambiar de escritorios con la rueda del mouse"
 
 #: src/modules/pager/e_mod_config.c:119 src/modules/pager/e_mod_config.c:158
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Mostrar íconos del escritorio"
+msgstr "Mostrar los nombres de los escritorios"
 
 #: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:198
-#, fuzzy
 msgid "Popup Settings"
-msgstr "Opciones del emergente del paginador"
+msgstr "Opciones del paginador emergente"
 
 #: src/modules/pager/e_mod_config.c:125 src/modules/pager/e_mod_config.c:199
-#, fuzzy
 msgid "Show popup on desktop change"
-msgstr "Mostrar Emergente al cambiar de escritorio"
+msgstr "Mostrar emergente al cambiar de escritorio"
 
 #: src/modules/pager/e_mod_config.c:128
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Mostrar emergente en una ventana urgente"
+msgstr "Mostrar emergente en ventanas urgentes"
 
 #: src/modules/pager/e_mod_config.c:162
 msgid "Select and Slide button"
-msgstr "Botón Elegir y desplazar "
+msgstr "Botón para Elegir y Desplazar "
 
 #: src/modules/pager/e_mod_config.c:164 src/modules/pager/e_mod_config.c:171
 #: src/modules/pager/e_mod_config.c:178 src/modules/pager/e_mod_config.c:386
 #: src/modules/pager/e_mod_config.c:391 src/modules/pager/e_mod_config.c:396
 #, c-format
 msgid "Click to set"
-msgstr "Pulsá para establecer"
+msgstr "Pulsa para establecer"
 
 #: src/modules/pager/e_mod_config.c:169
-#, fuzzy
 msgid "Drag and Drop button"
-msgstr "Botón de arrastrar y soltar"
+msgstr "Botón de Arrastrar y Soltar"
 
 #: src/modules/pager/e_mod_config.c:176
-#, fuzzy
 msgid "Drag whole desktop"
-msgstr "Escritorios virtuales"
+msgstr "Arrastrar escritorios completos"
 
 #: src/modules/pager/e_mod_config.c:185
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Acción de teclado altura de emerger"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:193
 #: src/modules/pager/e_mod_config.c:204
@@ -5975,14 +6088,12 @@ msgid "Resistance to dragging"
 msgstr "Resistencia al arrastre"
 
 #: src/modules/pager/e_mod_config.c:202
-#, fuzzy
 msgid "Popup pager height"
-msgstr "Velocidad de la emergente"
+msgstr "Altura del paginador emergente"
 
 #: src/modules/pager/e_mod_config.c:207 src/modules/pager/e_mod_config.c:221
-#, fuzzy
 msgid "Popup speed"
-msgstr "Velocidad de la emergente"
+msgstr "Velocidad a que emerge"
 
 #: src/modules/pager/e_mod_config.c:209 src/modules/pager/e_mod_config.c:223
 #, c-format
@@ -5990,18 +6101,16 @@ msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
 #: src/modules/pager/e_mod_config.c:214
-#, fuzzy
 msgid "Urgent Window Settings"
-msgstr "Opciones de la lista de ventanas"
+msgstr "Opciones urgentes de ventanas"
 
 #: src/modules/pager/e_mod_config.c:215
-#, fuzzy
 msgid "Show popup on urgent window"
-msgstr "Mostrar emergente en una ventana urgente"
+msgstr "Mostrar menú emergente en ventana urgente"
 
 #: src/modules/pager/e_mod_config.c:218
 msgid "Popup on urgent window sticks on the screen"
-msgstr "Emergente cuando hay ventanas urgentes pegadas en la pantalla"
+msgstr "Emerge al pegarse en la pantalla ventanas urgentes"
 
 #: src/modules/pager/e_mod_config.c:271
 msgid "Pager Button Grab"
@@ -6013,22 +6122,21 @@ msgid ""
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 "Presione un botón del mouse.<br>Presione <hilight>Escape</hilight> para "
-"abortar<br>o <hilight>Supr</hilight> para resetear el botón."
+"abortar<br>o <hilight>Supr</hilight> para restaurar el botón."
 
 #: src/modules/pager/e_mod_config.c:328
-#, fuzzy
 msgid "Attetion"
-msgstr "Acción"
+msgstr "Atención"
 
 #: src/modules/pager/e_mod_config.c:329
-#, 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 ""
-"No puede usar el botón derecho del mouse<br>ya que está tomado por un "
-"código<br>interno para los menúes contextuales."
+"No puede usar el botón derecho del ratón en el<br>gabinete para esto por que "
+"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_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
@@ -6041,31 +6149,26 @@ msgid "Virtual Desktops Configuration"
 msgstr "Configuración de Escritorios virtuales"
 
 #: src/modules/pager/e_mod_main.c:2806
-#, fuzzy
 msgid "Show Pager Popup"
-msgstr "Opciones del emergente del paginador"
+msgstr "Mostrar Paginador Emergente"
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
-#, fuzzy
 msgid "Popup Desk Right"
-msgstr "Voltear el escritorio a la derecha"
+msgstr "Emerger Escritorio Derecha"
 
 #: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2847
-#, fuzzy
 msgid "Popup Desk Left"
-msgstr "Voltear escritorio izquierda"
+msgstr "Emerger Escritorio Izquierda"
 
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
 msgid "Popup Desk Up"
-msgstr "Voltear escritorio arriba"
+msgstr "Emerger Escritorio Arriba"
 
 #: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
 msgid "Popup Desk Down"
-msgstr "Voltear el escritorio abajo"
+msgstr "Emerger Escritorio Abajo"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Iniciar"
 
@@ -6073,111 +6176,111 @@ msgstr "Iniciar"
 msgid "Temperature Configuration"
 msgstr "Configuración de temperatura"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Mostrar unidades"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celcius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Intervalo de chequeo"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Lento"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Muy lento"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Temperatura baja"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Temperatura baja"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6195,7 +6298,32 @@ msgstr "Atrás"
 
 #: src/modules/wizard/page_010.c:25
 msgid "Choose Language"
-msgstr "Elegir idioma"
+msgstr "Escoja el idioma"
+
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "La batería está baja<br>Su batería está baja.<br>Quizá quiera cambiar a "
+#~ "una fuente AC."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "Mal driver"
+
+#~ msgid "FULL"
+#~ msgstr "Llena"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Low"
+#~ msgstr "Baja"
+
+#~ msgid "Danger"
+#~ msgstr "Peligro"
+
+#~ msgid "Charging"
+#~ msgstr "Cargando"
 
 #~ msgid "NO INFO"
 #~ msgstr "Sin información"
@@ -6448,9 +6576,6 @@ msgstr "Elegir idioma"
 #~ msgid "Window Title"
 #~ msgstr "Título de la ventana"
 
-#~ msgid "Icon Class"
-#~ msgstr "Clase del ícono"
-
 #~ msgid "Misc"
 #~ msgstr "Misc"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index a180c60..140025c 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index d78db15..fcd2a32 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2008-01-23 02:45+0200\n"
 "Last-Translator: Jani väyrynen <janivayrynen at gmail.com>\n"
 "Language-Team: Finnish <janivayrynen at gmail.com>\n"
@@ -18,8 +18,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Tietoa Enlightenmentista"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -66,15 +66,15 @@ msgstr "Haluatko varmasti tappaa tämän ikkunan?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Kyllä"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Ei"
 
@@ -138,334 +138,334 @@ msgstr ""
 "Vaadit koneesi asettamista lepotilaan.<br><br>Haluatko varmasti asettua "
 "lepotilaan?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Ikkuna : Toiminnot"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Siirrä"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Muuta kokoa"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Valikko"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Ikkunavalikko"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Nosta"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Laske"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Sulje"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Tapa"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Ikkuna : Tila"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Tarttuva tila"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Ikonisoitu tila"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maksimoi leveyssuunnasa"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maksimoi Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimointitila \"Älykäs\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimointitila \"Laajennus\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimointitila \"Täyttö\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Varjo ylhäällä"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Varjo alhaalla"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Varjo vasemmalla"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Varjo oikealla"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Varjo"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Kehyksetön tila"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Kiinnitetty tila"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Näytä työpöytä"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -475,136 +475,136 @@ msgstr "vaihda työpöytään..."
 msgid "Screen"
 msgstr "Näyttö"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Lähetä hiiri näytölle 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Lähetä hiiri näytölle 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Lähetä hiiri näytölle..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Lähetä hiiri ruudun verran eteenpäin"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Lähetä hiiri ruudun verran taaksepäin"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Lähetä hiiri eteenpäin/taaksepäin..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Ikkuna : Siiretään"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Seuraavalle työpöydälle"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Edelliselle työpöydälle"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Työpöydältä #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Työpöydälle..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Näytä päävalikko"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Näytä Suosikkisovellukset-valikko"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Näytä Kaikki sovellukset -valikko"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Näytä Asiakkaat-valikko"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Näytä valikko..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Käynnistä"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Määritetty komento"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Sovellus"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Uloskirjaudu"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Poistu välittömästi"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Järjestelmä"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Sammuta"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Valmiustila levylle"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Työpöydän lukitus"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Siivoa ikkunat"
 
@@ -612,11 +612,11 @@ msgstr "Siivoa ikkunat"
 msgid "Set As Background"
 msgstr "Aseta taustakuvaksi"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "Työpöytätiedostojen skannaus valmis"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Työpöytätiedostojen skannaus"
 
@@ -658,11 +658,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Työpöytä %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Asetukset päivitetty"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -673,7 +673,7 @@ msgstr ""
 "ei voitu tunnistaa<br><br>Tiedosto, jossa virhe ilmeni,oli:<br>%"
 "s<br><br>Tämä tiedosto on poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -688,7 +688,7 @@ msgstr ""
 "asetukset.<br><br>Tiedosto, jossa virhe ilmeni, oli:<br>%s<br><br>Tämä "
 "tiedosto on poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -701,7 +701,7 @@ msgstr ""
 "<br><br>Tiedosto, jossa virhe ilmeni, oli:<br>%s<br><br>Tämä tiedosto on "
 "poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -715,7 +715,7 @@ msgstr ""
 "oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
 "välttämiseksi.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -727,17 +727,16 @@ msgstr ""
 "ilmeni, oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
 "välttämiseksi.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Enlightenmentin asetusten kirjoitusongelmat"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -746,19 +745,20 @@ msgstr "Enlightenmentin asetusten kirjoitusongelmat"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
@@ -774,14 +774,14 @@ msgstr "Käytä"
 msgid "Extensions"
 msgstr "Lisäosat"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Moduulit"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Säiliö %d"
@@ -851,7 +851,7 @@ msgid "Desktop Entry Editor"
 msgstr "Työpöydän alkioeditori"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Kuvake"
@@ -887,7 +887,7 @@ msgstr "Yleinen nimi"
 msgid "Window Class"
 msgstr "Ikkunan luokka"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Kategoriat"
@@ -932,6 +932,7 @@ msgstr "Valitse kuvake"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -939,7 +940,7 @@ msgstr "Peruuta"
 msgid "Select an Executable"
 msgstr "Valitse suoritettava ohjelma"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -947,15 +948,15 @@ msgstr "Valitse suoritettava ohjelma"
 msgid "Delete"
 msgstr "Poista"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Liitä"
 
@@ -963,24 +964,24 @@ msgstr "Liitä"
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Ajovirhe"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Ohjelman ajovirhe"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -989,193 +990,194 @@ msgstr ""
 "Enlightenment ei voinut suorittaa sovellusta:<br><br>%s<br><br>Sovelluksen "
 "käynnistys epäonnistui."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Sovelluksen suoritusvirhe"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Sovelluksen %s suoritus loppui odottamatta."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Lopetuskoodi %i palautettiin sovelluksesta %s."
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s keskeytyi keskeytyssignaaliin."
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s keskeytyi lopetussignaaliin."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s keskeytyi poikkeussignaaliin."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s keskeytyi liukulukuvirheeseen."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, 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:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s keskeytyi segmentointivirheeseen."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s keskeytyi rikkoutuneeseen putkeen."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s keskeytyi terminaatiosignaaliin."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s keskeytyi väylävirheeseen."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s keskeytyi signaaliin %i."
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Virhelogit"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Virheviestiä ei ollut."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Tallenna tämä viesti"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Virheinfo"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Virhesignaalin info"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Tulosteen data"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Tulostetta ei ollut."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "Puuttuva polku"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s ei ole olemassa"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i tiedostoa"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Näkymän tila"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Päivitä näkymä"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Näytä piilotiedostot"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Muista järjestys"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Lajittele nyt"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Uusi hakemisto"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Kuvakkeet"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Listaa"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Luo uusi hakemisto"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Uuden hakemiston nimi:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Uudelleennimeä %s:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Uudelleennimeä tiedosto"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Vahvista poisto"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1229,7 +1231,7 @@ msgid "Owner can write"
 msgstr "Omistaja saa kirjoittaa"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1262,49 +1264,49 @@ msgstr "Linkin info"
 msgid "Select an Image"
 msgstr "Valitse kuva"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu Tt"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu Gt"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu Mt"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu Kt"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu t"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Tuntematon tilavuus"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Irroitettava laita"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Paljas"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Upotettu"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1318,27 +1320,27 @@ msgstr "Upotettu"
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Vieritä sisältöä automaattisesti"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Koko muutettavissa"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Vempain: siirrä/muuta kokoa"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Poista tämä vempain"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Vempain: lopeta siirtäminen/koon muuttaminen"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1369,7 +1371,7 @@ msgstr ""
 "signaaleihin, kun käynnistys<br>on suoritettu. Sinun pitäisi käyttää "
 "käynnistyksessä<br>teemaa, joka on oikein tehty, tai korjata<br>käyttämäsi."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Ikkunalukot"
 
@@ -1403,21 +1405,21 @@ msgid "Lock program changing:"
 msgstr "Estä ohjelmaa muuttamasta ominaisuutta:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Sijainti"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Koko"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Pinoutuminen"
 
@@ -1426,12 +1428,12 @@ msgid "Iconified state"
 msgstr "Ikonisoitu tila"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Tarttuvuus"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Varjostuksen tila"
 
@@ -1447,7 +1449,7 @@ msgstr "Koko näytön -tila"
 msgid "Lock me from changing:"
 msgstr "Estä minua muuttamasta ominaisuutta:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Kehyksen tyyli"
 
@@ -1467,126 +1469,126 @@ msgstr "Uloskirjautumasta, kun tämä ikkuna on auki"
 msgid "Remember these Locks"
 msgstr "Muista nämä lukot"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Aina päällä"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Aina alla"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maksimoi leveyssuunnassa"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Poista maksimointi"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Muista"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Kehys"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Lähetä työpöydälle"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Kiinnitä työpöydälle"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Irrota työpöydältä"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Tila"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Ohita"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Muokkaa kuvaketta"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Lisää Suosikkisovellukset-valikkoon"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Lisää näppäimistötoiminto"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Lisää käynnistimeen"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Luo kuvake"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Ikkunan ominaisuudet"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Ikonisoi"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Valitse kehyksen tyyli"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Käytä E17:n oletuskuvakeasetuksia"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Käytä sovelluksen tarjoamaa kuvaketta"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Käytä käyttäjän määrittämää kuvaketta"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Varjostettu"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Tarttuva"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Koko näyttö"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Ikkunalista"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1595,6 +1597,11 @@ msgstr "Ikkunalista"
 msgid "Pager"
 msgstr "Sivuttaja"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Ohita tehtäväpalkki"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1607,7 +1614,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM:n ominaisuudet"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Otsikko"
 
@@ -1703,11 +1710,11 @@ msgstr "NetWM:n ominaisuudet"
 msgid "Modal"
 msgstr "Malli"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Ohita tehtäväpalkki"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Ohita Sivuttaja"
 
@@ -1715,15 +1722,15 @@ msgstr "Ohita Sivuttaja"
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Ikkunamuisti"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Ikkunan ominaisuudet eivät ole ainutlaatuiset"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1748,11 +1755,11 @@ msgstr ""
 "asetuksesi hyväksytään. Paina <hilight>Peruuta</hilight>, jos et<br>ole "
 "varma, eikä mitään muuteta."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Ei tunnistettavia ominaisuukia asetettuna"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1764,7 +1771,7 @@ msgstr ""
 "se tulisi muistaa</hilight>.<br><br>Sinun täytyy määrittää ainakin yksi "
 "tapa, jolla ikkuna muistetaan."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1795,119 +1802,119 @@ msgstr ""
 "painiketta<br>, jolloin asetuksesi hyväksytään. Paina <hilight>Peruuta</"
 "hilight>, jos et<br>ole varma, eikä mitään muuteta."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Koko ja sijainti"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Lukot"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Koko, sijainti ja lukot"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Kaikki"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Muista"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Ikkunan nimi ja luokka"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Ikkunan rooli"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Ikkunan tyyppi"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Vaihtuma"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Muistettavat ominaisuudet"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Kuvakkeen ominaisuudet"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Virtuaalityöpöytä"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Nykyinen näyttö"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Ohita ikkunalista"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Sovita vain yksi ikkuna"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Aloita tämä ohjelma sisäänkirjauduttaessa"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr "Aktivoi aina aloitettassa"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Tiedostonhallinta"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "Hylly #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Moduulien asetukset"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Käytettävissä olevat moduulit"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Ota moduuli käyttöön"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Käytössä olevat moduulit"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Poista moduuli käytöstä"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1972,10 +1979,12 @@ msgstr "Suosikkisovellukset"
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Ikkunat"
 
@@ -2001,52 +2010,52 @@ msgstr "Hyllyt"
 msgid "Show/Hide All Windows"
 msgstr "Näytä/Piilota kaikki ikkunat"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Ei sovelluksia)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Muokkaa virtuaalityöpöytiä"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Lukitse näyttö"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Ei ikkunoita)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Kadonneet ikkunat"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Ei nimeä!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Ei hyllyjä)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Hylly #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Lisää hylly"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Poista hylly"
 
@@ -2055,13 +2064,13 @@ msgid "Shelf Configuration"
 msgstr "Hyllyn asetukset"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pieni"
 
@@ -2070,12 +2079,12 @@ msgid "Medium"
 msgstr "Keskiarvoinen"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Suuri"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Valtava"
 
@@ -2113,7 +2122,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pikseliä"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Tyylit"
 
@@ -2665,7 +2674,7 @@ msgstr "Muokkaa hyllyjä"
 msgid "Almost Done"
 msgstr "Melkein valmis"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2674,11 +2683,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Virhe moduulin lataamisessa"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2687,11 +2696,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Moduuli ei sisällä kaikkia tarvittuja funktioita"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2702,12 +2711,12 @@ msgstr ""
 "vähintään moduuli-API:n version %i.<br>Enlightenmentin ilmoittama moduuli-"
 "API on: %i.<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenmentin %s-moduuli"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Haluaisitko poistaa käytöstä tämän moduulin?<br>"
 
@@ -3003,9 +3012,9 @@ msgstr "Lisää Suosikkeihin"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Siirry ylös hakemistossa"
 
@@ -3042,39 +3051,39 @@ msgstr "Kielletty"
 msgid "Read-Write"
 msgstr "Luku-Kirjoitus"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Akkumonitorin asetukset"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Perusasetukset"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Näytä varoitus akun ollessa vähänä"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Lisäasetukset"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Akun tarkistuksen väli:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tiedostoa"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Hälytä akun tason ollessa:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3085,71 +3094,51 @@ msgstr "Hälytä akun tason ollessa:"
 msgid "%1.0f minutes"
 msgstr "%1.0f minuuttia"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f prosenttia"
 
-#: src/modules/battery/e_mod_main.c:137
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f sekuntia"
+
+#: src/modules/battery/e_mod_main.c:129
 msgid "Battery"
 msgstr "Akku"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Akun virta vähänä<br>Akkusi virta on vähänä.<br>Voit haluta vaihtaa "
-"verkkovirtaan."
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Akkumittari"
 
-#: src/modules/battery/e_mod_main.c:355
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
+#: src/modules/battery/e_mod_main.c:563
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "HUONO AJURI"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "TÄYSI"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Korkea"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Vähäinen"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Vaara"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Ladataan"
-
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
-msgstr "Akkumittari"
-
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Kello"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenmentin asetukset"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Kohteet"
 
@@ -3180,7 +3169,7 @@ msgid "Restart Applications"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Kaikki sovellukset"
 
@@ -3237,7 +3226,7 @@ msgstr "Ryhmittelyn peruste"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3343,7 +3332,7 @@ msgid "Error Text"
 msgstr "Virhelogit"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 #, fuzzy
 msgid "Menu Title"
 msgstr "Otsikko"
@@ -3353,7 +3342,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 #, fuzzy
 msgid "Menu Item"
 msgstr "Valikon kohteiden tekstit"
@@ -3364,13 +3353,13 @@ msgid "Menu Item Active"
 msgstr "Valikon kohteiden tekstit"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 #, fuzzy
 msgid "Move Text"
 msgstr "Siirrä"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Resize Text"
 msgstr "Muuta kokoa"
@@ -3385,13 +3374,13 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 #, fuzzy
 msgid "Winlist Title"
 msgstr "Näytä otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 #, fuzzy
 msgid "Widgets"
 msgstr "Vempainten värit"
@@ -3430,7 +3419,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 #, fuzzy
 msgid "List Header"
 msgstr "Asiakasjohtaja"
@@ -3518,6 +3507,7 @@ msgstr "Työpöydän nimi"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -3559,10 +3549,10 @@ msgstr "Joutoaika"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Oma"
 
@@ -3899,11 +3889,11 @@ msgstr "Ota komposiitti käyttöön"
 msgid "Default Engine"
 msgstr "Oletusmoottori"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr "Ota komposiitituki käyttöön?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4029,210 +4019,215 @@ msgstr "Y-akselin kohdistus"
 msgid "Run Command"
 msgstr "Suorita komento"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "Sulje"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 #, fuzzy
 msgid "Title Bar"
 msgstr "Otsikko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 #, fuzzy
 msgid "Configure Heading"
 msgstr "Asetukset"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 #, fuzzy
 msgid "About Title"
 msgstr "Tietoa teemasta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 #, fuzzy
 msgid "About Text"
 msgstr "Tietoa"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 #, fuzzy
 msgid "Desklock Title"
 msgstr "Työpöytätiedosto"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 #, fuzzy
 msgid "Dialog Error"
 msgstr "Valintaikkunat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 #, fuzzy
 msgid "Exebuf Command"
 msgstr "Suorituskomento"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 #, fuzzy
 msgid "Splash Title"
 msgstr "Näytä otsikko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 #, fuzzy
 msgid "Frame"
 msgstr "Ruudunpäivitys"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 #, fuzzy
 msgid "Label"
 msgstr "Kuvakkeiden nimikkeet"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 #, fuzzy
 msgid "Buttons"
 msgstr "Painike %i"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 #, fuzzy
 msgid "Slider"
 msgstr "Koko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 #, fuzzy
 msgid "Text List Item"
 msgstr "Asiakaslista-valikko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 #, fuzzy
 msgid "List Item"
 msgstr "Listaa"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "Tiedostonhallinta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Näytä työpöydän kuvakkeet"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 #, fuzzy
 msgid "Normal Styled"
 msgstr "Normaali"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Fonttien asetukset"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Suuri"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Todella suuri"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pikseliä"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Ota käyttöön mukautetut fonttiluokat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Fontit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Esikatseluteksti: abc ABC 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Fonttiluokat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Ota käyttöön fonttiluokat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Vihjeistys"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Tavukoodi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Varafontit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Varafontin nimi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 #, fuzzy
 msgid "Enable Fallbacks"
 msgstr "Ota käyttöön varafontit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Laajempi esikatseluteksti.. abcåäö ABCÅÄÖ 123"
 
@@ -4271,7 +4266,7 @@ msgid "New"
 msgstr "Uusi"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Tuo..."
 
@@ -4321,22 +4316,64 @@ msgstr "Kieli"
 msgid "Input Method Settings"
 msgstr "Syöttötavan asetukset"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Valinnan asetukset"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pikseliä"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pikseliä/sekunti"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f sekuntia"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Sisäinen"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Kielen asetukset"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Kielen valinta"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Valittu lokaali"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Lokaali"
 
@@ -4655,11 +4692,6 @@ msgstr "Käytä X:n kursoria"
 msgid "Cursor Size"
 msgstr "Kursorin koko"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pikseliä"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Hiiren kursori"
@@ -4694,7 +4726,7 @@ msgid "Images"
 msgstr "Kuvat"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Teemat"
 
@@ -4853,11 +4885,6 @@ msgstr "X-näytönsäästäjän alkamisen viive"
 msgid "Time until X screensaver alternates"
 msgstr "X-näytönsäästäjän vaihtumisen viive"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekuntia"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Ruudunpimennys"
@@ -4916,23 +4943,23 @@ msgstr "Näytä käynnistysruutu sisäänkirjauduttaessa"
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Teeman valitsin"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Teeman osa-alueet"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Ota käyttöön"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Poista käytöstä"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Poista kaikki käytöstä"
 
@@ -4978,38 +5005,43 @@ msgstr "Taustakuvan vaihto"
 msgid "Transitions"
 msgstr "Vaihtumat"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Taustakuvan asetukset"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Käytä teeman taustakuvaa"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Kuva..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Gradientti..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Mihin taustakuva sijoitetaan"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Kaikille työpöydille"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Tälle työpöydälle"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Tälle näytölle"
 
@@ -5059,7 +5091,7 @@ msgstr "Gradientin luontivirhe"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Jostain syystä Enlightenment ei voinut luoda gradienttia."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Valitse kuva..."
 
@@ -5109,17 +5141,17 @@ 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_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Taustakuvan tuontivirhe"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5127,6 +5159,63 @@ msgstr ""
 "Enlightenment ei voinut tuoda taustakuvaa.<br><br>Oletko varma, että tämä on "
 "taustakuvatiedosto?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5416,6 +5505,62 @@ msgstr "Salli ikkunoiden manipulointi"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Siirrä ikkunaa/muuta ikkunan kokoa automaattisesti hyllyn piiloutuessa"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Ikkunamuisti"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Aseta muistamiset"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Oletukset"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Kuvakkeen nimi"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Luokka"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Luokka"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Otsikko"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Otsikko"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Rooli"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Ei mitään>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Ikkunalistan asetukset"
@@ -5776,19 +5921,19 @@ msgstr "Näytä työkalurivi"
 msgid "Go to Parent Directory"
 msgstr "Mene isäntähakemistoon"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Avaa"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Avaa sovelluksella..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Määritetyt sovellukset"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr "Mukautettu komento"
 
@@ -6070,7 +6215,7 @@ msgstr "Ponnahdusnopeus"
 msgid "Popup Desk Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Aloita"
 
@@ -6078,111 +6223,111 @@ msgstr "Aloita"
 msgid "Temperature Configuration"
 msgstr "Lämpötilan asetukset"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Näytä yksiköt"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Tarkistusaikaväli"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Nopea"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Hidas"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Hyvin hidas"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Korkea lämpötila"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Matala lämpötila"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensorit"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Lämpötila"
 
@@ -6202,6 +6347,31 @@ msgstr "Takaisin"
 msgid "Choose Language"
 msgstr "Valitse kieli"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Akun virta vähänä<br>Akkusi virta on vähänä.<br>Voit haluta vaihtaa "
+#~ "verkkovirtaan."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "HUONO AJURI"
+
+#~ msgid "FULL"
+#~ msgstr "TÄYSI"
+
+#~ msgid "High"
+#~ msgstr "Korkea"
+
+#~ msgid "Low"
+#~ msgstr "Vähäinen"
+
+#~ msgid "Danger"
+#~ msgstr "Vaara"
+
+#~ msgid "Charging"
+#~ msgstr "Ladataan"
+
 #~ msgid "NO INFO"
 #~ msgstr "EI INFOA"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 9ecbf1d..bb7848a 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 7eedc43..ff1c292 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-06-04 11:27+0100\n"
 "Last-Translator: Antoine Giniès <aginies.cooker at gmail.com>\n"
 "Language-Team: Enlightenment i18n French <enlightenment-intl at lists."
@@ -19,8 +19,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos d'Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -68,15 +68,15 @@ msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Oui"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Non"
 
@@ -145,334 +145,334 @@ msgstr ""
 "Vous avez demandé à hiberner votre ordinateur.<br><br>Êtes-vous sur de "
 "vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Monter"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Descendre"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Inversion de l'ancrage"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Inversion de la minimisation"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Inversion du mode plein écran"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximisation en mode \"plein écran\""
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximisation en mode \"intelligent\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximisation en mode \"expansion\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximisation en mode \"remplissage\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Mode de basculement de l'ombre vers le haut"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Mode de basculement de l'ombre vers le bas"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Mode de basculement de l'ombre vers la gauche"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Mode de basculement de l'ombre vers la droite"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Inversion de l'enroulement"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Inversion du mode sans bordure"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Inversion du mode d'ancrage"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Se déplacer vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Se déplacer vers le bureau à droite"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Se déplacer vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Se déplacer vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Se déplacer vers le bureau"
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Passer au bureau 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Passer au bureau 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Passer au bureau 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Passer au bureau 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Passer au bureau 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Passer au bureau 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Passer au bureau 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Passer au bureau 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Passer au bureau 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Passer au bureau 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Passer au bureau 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Passer au bureau 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Passer au bureau..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Se déplacer vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Se déplacer vers le bureau à droite"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Se déplacer vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Se déplacer vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Se déplacer vers le bureau"
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passer au bureau 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passer au bureau 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passer au bureau 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passer au bureau 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passer au bureau 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passer au bureau 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passer au bureau 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passer au bureau 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passer au bureau 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passer au bureau 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passer au bureau 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passer au bureau 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passer au bureau..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -482,136 +482,136 @@ msgstr "Passer au bureau..."
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Déplacer la souris de ... écrans"
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Déplacer vers le bureau suivant"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Déplacer vers le bureau précédent"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Déplacer vers de ... bureaux"
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Déplacer vers le bureau..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des applications favorites"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Lancer"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Commande définie"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Fermer la session"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Quitter immédiatement"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Éteindre"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Mettre en veille"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Verrouillage du bureau"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Ré-arranger les fenêtres"
 
@@ -620,12 +620,12 @@ msgstr "Ré-arranger les fenêtres"
 msgid "Set As Background"
 msgstr "Fonds d'écran"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Fichier Bureau"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Fichier Bureau"
@@ -670,11 +670,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Bureau %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Configuration mise à jour"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -686,7 +686,7 @@ msgstr ""
 "fichier concerné par l'erreur est :<br>%s<br><br>Ce fichier a été supprimé "
 "afin<br>d'éviter des données corrompues.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -702,7 +702,7 @@ msgstr ""
 "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.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -716,7 +716,7 @@ msgstr ""
 "apparu est :<br>%s<br><br>Ce fichier a été effacé pour éviter des erreurs de "
 "corruption.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -730,7 +730,7 @@ msgstr ""
 "concerné par l'erreur est :<br>%s<br><br>Le fichier a été supprimé afin "
 "d'éviter des données corrompues.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -741,18 +741,17 @@ 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.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -761,19 +760,20 @@ msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avancé"
 
@@ -789,14 +789,14 @@ msgstr "Appliquer"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Modules"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
@@ -867,7 +867,7 @@ msgid "Desktop Entry Editor"
 msgstr "Editeur "
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icône"
@@ -903,7 +903,7 @@ msgstr "Nom générique"
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Catégories"
@@ -950,6 +950,7 @@ msgstr "Sélectionner une icône"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -958,7 +959,7 @@ msgstr "Annuler"
 msgid "Select an Executable"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -966,15 +967,15 @@ msgstr "Sélectionner une image"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Coller"
 
@@ -982,24 +983,24 @@ msgstr "Coller"
 msgid "Select All"
 msgstr "Tout selectionner"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Erreur d'exécution d'une application"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1008,196 +1009,196 @@ 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:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s c'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, 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:432
+#: src/bin/e_exec.c:437
 #, 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:434
+#: src/bin/e_exec.c:439
 #, 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:438
+#: src/bin/e_exec.c:443
 #, 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:441
+#: src/bin/e_exec.c:446
 #, 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:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu par un signal prioritaire de mort."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, 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:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s a été interrompu par un tube cassé."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, 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:456
+#: src/bin/e_exec.c:461
 #, 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:459
+#: src/bin/e_exec.c:464
 #, 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:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Historique des erreurs"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Sauver ce message"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Informations sur l'erreur"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i fichiers"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode édition"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Rafraîchir la vue"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Se souvenir de l'ordre"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Classé maintenant"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Icônes"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1251,7 +1252,7 @@ msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1284,49 +1285,49 @@ msgstr "Informations sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Inconnu"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Tel que"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Encart"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1340,27 +1341,27 @@ msgstr "Encart"
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Activer le Déplacement/redimensionnement de ce gadget"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de Déplacer/redimensionner ce gadget"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1394,7 +1395,7 @@ msgstr ""
 "thème<br> d'init splash qui est valide, ou fixer celui<br>qui vous utilisez "
 "actuellement."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Verrous"
 
@@ -1431,21 +1432,21 @@ msgid "Lock program changing:"
 msgstr "Empêcher le programme de changer :"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Taille"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1454,12 +1455,12 @@ msgid "Iconified state"
 msgstr "État de minimisation"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "État d'ancrage"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "État d'enroulement"
 
@@ -1475,7 +1476,7 @@ msgstr "État de plein écran"
 msgid "Lock me from changing:"
 msgstr "M'empêcher de changer :"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Style de bordure"
 
@@ -1495,129 +1496,129 @@ 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:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Toujours devant"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Toujours derrière"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Ne pas maximiser"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Rappels"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Envoyer vers le bureau"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Accroché au bureau"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Décroché du bureau"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "État"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Editer l'icône"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Ajouter aux Menu favoris"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Ajouter l'application au lanceur"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Créer une icône"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propriétés de la fenêtre"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Style de bordure par défaut"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icône fournie par l'application"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Dossiers définis par l'utilisateur"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Enroulé"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Ancré"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1626,6 +1627,11 @@ msgstr "Liste de fenêtres"
 msgid "Pager"
 msgstr "Pager"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Eviter la barre des tâches"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1638,7 +1644,7 @@ 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:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Titre"
 
@@ -1734,11 +1740,11 @@ msgstr "Propriétés NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Eviter la barre des tâches"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Eviter le Pager"
 
@@ -1746,15 +1752,15 @@ msgstr "Eviter le Pager"
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Rappels de fenêtre"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Propriétés de fenêtre partagées"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1779,11 +1785,11 @@ msgstr ""
 "paramètres<br>seront acceptés. Cliquez sur <hilight>Annuler</hilight> si "
 "vous n'êtes pas sûr et rien ne sera modifié."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Aucune propriété n'est rencontrée"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1796,7 +1802,7 @@ msgstr ""
 "précisez au moins 1 méthode pour se souvenir des propriétés de cette "
 "fenêtres."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1823,125 +1829,125 @@ msgstr ""
 "<hilight>OK</hilight><br> et vos paramètres seront accepté. Pressez "
 "<hilight>Annuler</hilight> si<br>vous doutez et rien ne sera changé."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Rien"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Taille et position"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Tout"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Rappel en utilisant"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nom et classe de fenêtre"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Rôle de fenêtre"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Type de fenêtre"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Transition"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Propriétés à retenir"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 #, fuzzy
 msgid "Icon Preference"
 msgstr "Non préféré"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Bureau virtuel"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Ecran courant"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Enlever de la liste des fenêtres"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "N'appliquer qu'à une fenêtre"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Démarrer ce programme à l'ouverture de session"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configuration"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "Nom du fichier"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "Gondole #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Paramètres du module"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 #, fuzzy
 msgid "Available Modules"
 msgstr "Gadgets disponibles"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 #, fuzzy
 msgid "Load Module"
 msgstr "Module"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "Modules"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 #, fuzzy
 msgid "Unload Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2008,10 +2014,12 @@ msgstr "Applications favorites"
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2037,52 +2045,52 @@ msgstr "Gondoles"
 msgid "Show/Hide All Windows"
 msgstr "Afficher/cacher toutes les fenêtres"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Aucune application)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configurer les bureaux virtuels"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Écran de verrouillage"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Fermer la session"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Aucun Nom !"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Aucune gondole)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Gondole #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Ajouter une gondole"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Supprimer une gondole"
 
@@ -2091,13 +2099,13 @@ msgid "Shelf Configuration"
 msgstr "Configuration de gondole"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Petit"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Petit"
 
@@ -2106,12 +2114,12 @@ msgid "Medium"
 msgstr "Moyen"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
@@ -2149,7 +2157,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Styles"
 
@@ -2743,7 +2751,7 @@ msgstr "Gondoles configurées"
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2752,11 +2760,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2765,11 +2773,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2780,12 +2788,12 @@ 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:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous décharger ce module ?<br>"
 
@@ -3094,9 +3102,9 @@ msgstr "Ajouter aux favoris"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Remonter d'un dossier"
 
@@ -3133,39 +3141,39 @@ msgstr "Interdit"
 msgid "Read-Write"
 msgstr "Lecture-écriture"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configuration de la batterie"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Paramètres basiques"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 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:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Controller la batterie tous les:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fichiers"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3176,72 +3184,52 @@ msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 msgid "%1.0f minutes"
 msgstr "%1.0f minutes"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, fuzzy, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f secondes"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Batterie"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Batterie vide<br>Votre batterie est presque vide.<br>Vous devriez vous "
-"branchez sur le secteur."
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "MAUVAIS PILOTE"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "PLEINE"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Elevée"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Faible"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Danger"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f secondes"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "En charge"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configuration d'Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3272,7 +3260,7 @@ msgid "Restart Applications"
 msgstr "Applications à redémarrer"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3333,7 +3321,7 @@ msgstr "Groupé par"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3435,7 +3423,7 @@ msgid "Error Text"
 msgstr "Texte d'erreur"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Titre de menu"
 
@@ -3444,7 +3432,7 @@ msgid "Menu Title Active"
 msgstr "Titre actif de menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Élément de menu"
 
@@ -3453,12 +3441,12 @@ msgid "Menu Item Active"
 msgstr "Élément actif de menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Texte de déplacement"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Texte de redimensionnement"
 
@@ -3471,12 +3459,12 @@ msgid "Winlist Label"
 msgstr "Label de la liste des fenêtres"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Titre de la liste des fenêtres"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Éléments"
 
@@ -3513,7 +3501,7 @@ msgid "List Item Odd Text"
 msgstr "Texte de la liste des éléments impairs"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "En-tête de liste"
 
@@ -3599,6 +3587,7 @@ msgstr "Nom du bureau"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nom :"
 
@@ -3641,10 +3630,10 @@ msgstr "Temps de non activité à dépassé"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Personnel"
 
@@ -3989,12 +3978,12 @@ msgstr "Activer les police personnelles"
 msgid "Default Engine"
 msgstr "Défaut"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Activer les police personnelles"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4119,194 +4108,199 @@ msgstr "Alignement sur l'axe Y"
 msgid "Run Command"
 msgstr "Exécuter une commande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "Fermer"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Barre de titre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Bloc de texte justifié"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Bloc de texte petit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Gros bloc de texte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Configuration de l'entête"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Titre des "
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Version d'a propos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "A propos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Titre du verrouillage de bureau"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Mot de Passe de l'écran de verouillage"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Fenêtre d'erreur"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Commande Exebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Titre du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Texte du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Version du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Entrée"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Cadre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Label"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Boutons"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Slider"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Boutons radio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Bouton radio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Texte de la liste des éléments"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Élément de la liste"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "Nom du fichier"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Afficher un message lors changement bureau"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Style petit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Style normal"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Style gras"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Paramètres de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Gros"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Très gros"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Activer les police personnelles"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualisation basique du texte: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Astuce"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Font de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Nom de la font de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Activé les fonts de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pré-visualisation avancée de texte...我真的会写中文"
 
@@ -4345,7 +4339,7 @@ msgid "New"
 msgstr "Nouveau"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importer..."
 
@@ -4397,22 +4391,64 @@ msgstr "Langue"
 msgid "Input Method Settings"
 msgstr "Paramétrage de la Méthode de sasie"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Paramètres de sélection"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixels"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pixels/s"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f s"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interlingua"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configuration de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Sélectionneur de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Locale sélectionnée"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Locale"
 
@@ -4735,11 +4771,6 @@ msgstr "Utiliser le curseur du serveur X"
 msgid "Cursor Size"
 msgstr "Taille du curseur"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixels"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
@@ -4774,7 +4805,7 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Thèmes"
 
@@ -4939,11 +4970,6 @@ msgstr "Délai avant le démarrage de l'écran de veille"
 msgid "Time until X screensaver alternates"
 msgstr "Délai avant le changement d'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondes"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Masquer"
@@ -5002,26 +5028,26 @@ msgstr "Afficher l'écran de démarrage à la connexion"
 msgid "Startup"
 msgstr "Démarrage"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Catégories"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 #, fuzzy
 msgid "Assign"
 msgstr "Russe"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 #, fuzzy
 msgid "Clear"
 msgstr "Proche"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 #, fuzzy
 msgid "Clear All"
 msgstr "Tout supprimer"
@@ -5068,38 +5094,43 @@ msgstr "Changement de fond d'écran"
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Paramètres de fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Image..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Dégradé..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Placer ce fond d'écran sur :"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Tous les bureaux"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Ce bureau"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Cet écran"
 
@@ -5149,7 +5180,7 @@ msgstr "Erreur de création du dégradé"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Dû à certaines raisons, Enlightenment n'a pu créer un dégradé."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Choisir une image..."
 
@@ -5200,18 +5231,18 @@ msgid ""
 msgstr ""
 "Enlightenment n'a pu importer l'image<br>dû à des erreurs de conversion."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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>dû à une erreur de copie."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5219,6 +5250,63 @@ msgstr ""
 "Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr que ce "
 "soit un fond d'écran valide ?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5516,6 +5604,62 @@ msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Déplacer/redimensionner automatiquement lorsque la gondole s'auto-cache"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Rappels de fenêtre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Rappels"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Valeurs par défaut"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nom d'icône"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Classe d'icône"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Titre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Titre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Rôle"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Aucun>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Paramètres de la liste de fenêtres"
@@ -5888,19 +6032,19 @@ msgstr "Couleur de l'ombre"
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Exécuter une commande"
@@ -6197,7 +6341,7 @@ msgstr "Se déplacer vers le bureau au dessus"
 msgid "Popup Desk Down"
 msgstr "Se déplacer vers le bureau en dessous"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Menu E"
 
@@ -6205,111 +6349,111 @@ msgstr "Menu E"
 msgid "Temperature Configuration"
 msgstr "Configuration de la Température"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Afficher les unités"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Fréquence des vérifications"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Lent"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Très lent"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Température élevée"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 °F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 °F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 °F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Température faible"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130°F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 °F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 °C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 °C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 °C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 °C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 °C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f °F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Température"
 
@@ -6333,6 +6477,31 @@ msgstr "Basique"
 msgid "Choose Language"
 msgstr "Langue"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Batterie vide<br>Votre batterie est presque vide.<br>Vous devriez vous "
+#~ "branchez sur le secteur."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "MAUVAIS PILOTE"
+
+#~ msgid "FULL"
+#~ msgstr "PLEINE"
+
+#~ msgid "High"
+#~ msgstr "Elevée"
+
+#~ msgid "Low"
+#~ msgstr "Faible"
+
+#~ msgid "Danger"
+#~ msgstr "Danger"
+
+#~ msgid "Charging"
+#~ msgstr "En charge"
+
 #~ msgid "NO INFO"
 #~ msgstr "PAS D'INFORMATION"
 
@@ -6523,9 +6692,6 @@ msgstr "Langue"
 #~ msgid "Armenian"
 #~ msgstr "Arménien"
 
-#~ msgid "Interlingua"
-#~ msgstr "Interlingua"
-
 #~ msgid "Indonesian"
 #~ msgstr "Indonésien"
 
@@ -7925,9 +8091,6 @@ msgstr "Langue"
 #~ msgid "Use Icon Theme"
 #~ msgstr "Utiliser le thème d'icône"
 
-#~ msgid "Icon Class"
-#~ msgstr "Classe d'icône"
-
 #~ msgid "Misc"
 #~ msgstr "Autre"
 
diff --git a/po/fr_CH.gmo b/po/fr_CH.gmo
index 869c9bd..d0682d1 100644
Binary files a/po/fr_CH.gmo and b/po/fr_CH.gmo differ
diff --git a/po/fr_CH.po b/po/fr_CH.po
index 1e27256..bb4fd79 100644
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-06-04 11:27+0100\n"
 "Last-Translator: Antoine Giniès <aginies.cooker at gmail.com>\n"
 "Language-Team: Enlightenment i18n French <enlightenment-intl at lists."
@@ -42,8 +42,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos d'Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -91,15 +91,15 @@ msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Oui"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Non"
 
@@ -167,334 +167,334 @@ msgstr ""
 "Vous avez demandé à hiberner votre ordinateur.<br><br>Êtes-vous sur de "
 "vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Changer la taille (resize)"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Monter"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Descendre"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Iconifier (on/off)"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximiser en mode \"plein écran\""
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximiser en mode \"intelligent\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximiser en mode \"expansion\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximiser en mode \"remplissage\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Ombre vers le haut (on/off)"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Ombre vers le bas (on/off)"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Ombre vers la gauche (on/off)"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Ombre vers la droite (on/off)"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Sans bordure (on/off)"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -504,136 +504,136 @@ msgstr "Aller au bureau..."
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envoyer la souris ... écrans plus loin"
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Déplacer vers le bureau suivant"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Déplacer vers le bureau précédent"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Déplacer vers de ... bureaux"
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Déplacer vers le bureau..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des applications favorites"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Exécuter"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Commande prédéfinie"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Fermer la session"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Quitter immédiatement"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Éteindre"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Roupiller"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Verrouillage du bureau"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Ré-arranger les fenêtres"
 
@@ -642,12 +642,12 @@ msgstr "Ré-arranger les fenêtres"
 msgid "Set As Background"
 msgstr "Fonds d'écran"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Scan des fichiers du bureau terminé"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Scan des fichiers du bureau"
@@ -692,11 +692,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Bureau %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Configuration mise à jour"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -708,7 +708,7 @@ msgstr ""
 "fichier concerné par l'erreur est :<br>%s<br><br>Ce fichier a été supprimé "
 "afin<br>d'éviter des données corrompues.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -724,7 +724,7 @@ msgstr ""
 "lequel l'erreur est apparue est:<br>%s<br><br>Ce fichier a été effacé pour "
 "éviter des erreurs de corruption.<br> "
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -738,7 +738,7 @@ msgstr ""
 "apparue est :<br>%s<br><br>Ce fichier a été effacé pour éviter des erreurs "
 "de corruption.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -752,7 +752,7 @@ msgstr ""
 "concerné par l'erreur est :<br>%s<br><br>Le fichier a été supprimé afin "
 "d'éviter des données corrompues.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -763,18 +763,17 @@ 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.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -783,19 +782,20 @@ msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avancé"
 
@@ -811,14 +811,14 @@ msgstr "Appliquer"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Modules"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
@@ -890,7 +890,7 @@ msgid "Desktop Entry Editor"
 msgstr "Editer un élément du bureau"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icône"
@@ -926,7 +926,7 @@ msgstr "Nom générique"
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Catégories"
@@ -973,6 +973,7 @@ msgstr "Sélectionner une icône"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -981,7 +982,7 @@ msgstr "Annuler"
 msgid "Select an Executable"
 msgstr "Sélectionner un programme"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -989,15 +990,15 @@ msgstr "Sélectionner un programme"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Coller"
 
@@ -1005,24 +1006,24 @@ msgstr "Coller"
 msgid "Select All"
 msgstr "Tout selectionner"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Erreur d'exécution d'une application"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1031,196 +1032,196 @@ 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:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s c'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, 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:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s a été interrompu avec SIGINT"
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s a été interrompu avec SIGQUIT."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s a été interrompu avec SIGABRT."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, 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:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu avec SIGKILL."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, 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:450
+#: src/bin/e_exec.c:455
 #, 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:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s a été interrompu avec SIGTERM."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, 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:459
+#: src/bin/e_exec.c:464
 #, 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:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Historique des erreurs"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Sauver ce message"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Informations sur l'erreur"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i fichiers"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode de vue"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Rafraîchir la vue"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Se souvenir de l'ordre"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Icônes"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1274,7 +1275,7 @@ msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1307,49 +1308,49 @@ msgstr "Informations sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "volume inconnu"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Tel quel"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Encart"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1363,27 +1364,27 @@ msgstr "Encart"
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Déplacer / redimensionner ce gadget"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de Déplacer/redimensionner ce gadget"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1417,7 +1418,7 @@ msgstr ""
 "thème<br> d'init splash qui est valide, ou réparer celui<br>qui vous "
 "utilisez actuellement."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Verrouillage des propriétés..."
 
@@ -1451,21 +1452,21 @@ msgid "Lock program changing:"
 msgstr "Empêcher le programme de changer :"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Position"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Taille"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1474,12 +1475,12 @@ msgid "Iconified state"
 msgstr "État de minimisation"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "État d'ancrage"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "État d'enroulement"
 
@@ -1495,7 +1496,7 @@ msgstr "État de plein écran"
 msgid "Lock me from changing:"
 msgstr "M'empêcher de changer :"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Style de bordure"
 
@@ -1515,129 +1516,129 @@ 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:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Toujours au-dessus"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Toujours en-dessous"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Rappels"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Envoyer vers le bureau"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Accroché au bureau"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Décroché du bureau"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "État"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Echapper"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Editer l'icône"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Ajouter au menu favoris"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Ajouter un raccourci clavier"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Ajouter l'application au lanceur"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Créer une icône"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propriétés de la fenêtre"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Style de bordure par défaut"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 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:847
+#: src/bin/e_int_border_menu.c:871
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icône fournie par l'application"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Choix manuel de l'icône"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Enroulé"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Sur tous les bureaux"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1646,6 +1647,11 @@ msgstr "Liste des fenêtres"
 msgid "Pager"
 msgstr "Pager"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Ne pas afficher dans la barre des tâches"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1658,7 +1664,7 @@ 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:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Titre"
 
@@ -1754,11 +1760,11 @@ msgstr "Propriétés NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Ne pas afficher dans la barre des tâches"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Ne pas afficher dans le pager"
 
@@ -1766,15 +1772,15 @@ msgstr "Ne pas afficher dans le pager"
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Rappels de fenêtre"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Propriétés de fenêtre partagées"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1799,11 +1805,11 @@ msgstr ""
 "paramètres<br>seront acceptés. Cliquez sur <hilight>Annuler</hilight> si "
 "vous n'êtes pas sûr et rien ne sera modifié."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Aucune propriété n'est rencontrée"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1816,7 +1822,7 @@ msgstr ""
 "précisez au moins 1 méthode pour se souvenir des propriétés de cette "
 "fenêtres."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1843,125 +1849,125 @@ msgstr ""
 "<hilight>OK</hilight><br> et vos paramètres seront accepté. Pressez "
 "<hilight>Annuler</hilight> si<br>vous doutez et rien ne sera changé."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Rien"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Taille et position"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Tout"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Rappel en utilisant"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nom et classe de fenêtre"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Rôle de fenêtre"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Type de fenêtre"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Transience"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Propriétés à retenir"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 #, fuzzy
 msgid "Icon Preference"
 msgstr "Non préféré"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Bureau virtuel"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Ecran actuel"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Ne pas afficher dans la liste des fenêtres"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "N'appliquer qu'à une fenêtre"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Démarrer ce programme à l'ouverture de session"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configuration"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "Nom du fichier"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "Tablar #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Paramètres du module"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 #, fuzzy
 msgid "Available Modules"
 msgstr "Modules disponibles"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 #, fuzzy
 msgid "Load Module"
 msgstr "Charger le module"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "Modules chargés"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 #, fuzzy
 msgid "Unload Module"
 msgstr "Décharger le module"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2028,10 +2034,12 @@ msgstr "Applications favorites"
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2057,52 +2065,52 @@ msgstr "Tablars"
 msgid "Show/Hide All Windows"
 msgstr "Afficher/cacher toutes les fenêtres"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Aucune application)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configurer les bureaux virtuels"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Vérouiller l'écran"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Fermer la session"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Aucun Nom !"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Aucun tablar)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Tablar #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Ajouter tablar"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Supprimer un tablar"
 
@@ -2111,13 +2119,13 @@ msgid "Shelf Configuration"
 msgstr "Configuration du tablar"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Miquelet"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Petit"
 
@@ -2126,12 +2134,12 @@ msgid "Medium"
 msgstr "Moyen"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
@@ -2169,7 +2177,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Styles"
 
@@ -2765,7 +2773,7 @@ msgstr "Configurer les tablars"
 msgid "Almost Done"
 msgstr "Presque reglé"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2774,11 +2782,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2787,11 +2795,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2802,12 +2810,12 @@ 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:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous décharger ce module ?<br>"
 
@@ -3115,9 +3123,9 @@ msgstr "Ajouter aux favoris"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Dossier parent"
 
@@ -3154,39 +3162,39 @@ msgstr "Interdit"
 msgid "Read-Write"
 msgstr "Lecture-écriture"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configuration du moniteur de batterie"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Paramètres benêts"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 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:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Controller la batterie tous les:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fichiers"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3197,72 +3205,52 @@ msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 msgid "%1.0f minutes"
 msgstr "%1.0f minutes"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, fuzzy, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f secondes"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Batterie"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Votre batterie est presque vide.<br>Vous devriez vous branchez sur le "
-"secteur."
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "MAUVAIS PILOTE"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "PLEINE"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Elevée"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Faible"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Danger"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f secondes"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "En charge"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configuration d'Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3293,7 +3281,7 @@ msgid "Restart Applications"
 msgstr "Applications à démarrer après restart d'E"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3354,7 +3342,7 @@ msgstr "Groupé par"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3456,7 +3444,7 @@ msgid "Error Text"
 msgstr "Texte d'erreur"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Titre de menu"
 
@@ -3465,7 +3453,7 @@ msgid "Menu Title Active"
 msgstr "Titre de menu actif"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Élément de menu"
 
@@ -3474,12 +3462,12 @@ msgid "Menu Item Active"
 msgstr "Élément de menu actif"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Texte de déplacement"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Texte de redimensionnement"
 
@@ -3492,12 +3480,12 @@ msgid "Winlist Label"
 msgstr "Label de la liste des fenêtres"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Titre de la liste des fenêtres"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Widgets"
 
@@ -3534,7 +3522,7 @@ msgid "List Item Odd Text"
 msgstr "Eléments de liste impairs"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "En-tête de liste"
 
@@ -3620,6 +3608,7 @@ msgstr "Nom du bureau"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nom :"
 
@@ -3662,10 +3651,10 @@ msgstr "Temps de non activité à dépassé"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Personnel"
 
@@ -4010,12 +3999,12 @@ msgstr "Activer l'extension composite"
 msgid "Default Engine"
 msgstr "Moteur par défaut"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Activer l'extension composite"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4140,194 +4129,199 @@ msgstr "Alignement sur l'axe Y"
 msgid "Run Command"
 msgstr "Exécuter une commande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "Noyau (core)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Barre de titre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Bloc de texte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Bloc de texte (petiot)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Bloc de texte (gros)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Configuration de l'entête"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Titre 'à propos'"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Version 'à propos'"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Texte 'à propos'"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Titre du verrouillage de bureau"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Mot de Passe de l'écran de verouillage"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Fenêtre d'erreur"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Commande Exebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Titre du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Texte du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Version du Splash"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Entrée"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Cadre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Label"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Boutons"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Slider"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Boutons radio"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Checkbox"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Texte de la liste des éléments"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Élément de la liste"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "Nom du fichier"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Afficher les icônes sur le bureau"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Style petit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Style normal"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Style gras"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Paramètres de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Gros"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Enorme"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Activer les police personnelles"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualisation basique du texte: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Astuces"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Fonte de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Nom de la fonte de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Activer les fontes de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pré-visualisation avancée de texte...我真的会写中文"
 
@@ -4366,7 +4360,7 @@ msgid "New"
 msgstr "Nouveau"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importer..."
 
@@ -4418,22 +4412,64 @@ msgstr "Langue"
 msgid "Input Method Settings"
 msgstr "Paramétrage de la Méthode de sasie"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Paramètres de sélection"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixels"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pixels/s"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f s"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interlingua"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configuration de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Sélectionneur de langue"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Locale sélectionnée"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Locale"
 
@@ -4756,11 +4792,6 @@ msgstr "Utiliser le curseur du serveur X"
 msgid "Cursor Size"
 msgstr "Taille du curseur"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixels"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
@@ -4795,7 +4826,7 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Thèmes"
 
@@ -4960,11 +4991,6 @@ msgstr "Délai avant le démarrage de l'écran de veille"
 msgid "Time until X screensaver alternates"
 msgstr "Délai avant le changement d'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondes"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Eteindre (blanking)"
@@ -5023,26 +5049,26 @@ msgstr "Afficher l'écran de démarrage à la connexion"
 msgid "Startup"
 msgstr "Démarrage"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Catégories"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 #, fuzzy
 msgid "Assign"
 msgstr "Atitrer"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 #, fuzzy
 msgid "Clear"
 msgstr "Supprimer"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 #, fuzzy
 msgid "Clear All"
 msgstr "Tout supprimer"
@@ -5089,38 +5115,43 @@ msgstr "Changement de fond d'écran"
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Paramètres de fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Image..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Dégradé..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Placer ce fond d'écran sur :"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Tous les bureaux"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Ce bureau"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Cet écran"
 
@@ -5170,7 +5201,7 @@ msgstr "Erreur de création du dégradé"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Pour une raison obscure, Enlightenment n'a pas pu créer un dégradé."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Choisir une image..."
 
@@ -5221,19 +5252,19 @@ msgid ""
 msgstr ""
 "Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5241,6 +5272,63 @@ msgstr ""
 "Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr que ce "
 "soit un fond d'écran valide ?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5537,6 +5625,62 @@ msgstr "Autoriser la manipulation des fenêtres"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Déplacer/redimensionner automatiquement lorsque le tablar se planque"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Rappels de fenêtre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Rappels"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Valeurs par défaut"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nom de l'icône"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Classe d'icône"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Titre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Titre"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Rôle"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Aucun>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Paramètres de la liste de fenêtres"
@@ -5909,19 +6053,19 @@ msgstr "Couleur de l'ombre"
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Exécuter une commande"
@@ -6218,7 +6362,7 @@ msgstr "Vers le bureau au dessus"
 msgid "Popup Desk Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Menu E"
 
@@ -6226,111 +6370,111 @@ msgstr "Menu E"
 msgid "Temperature Configuration"
 msgstr "Configuration de la Température"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Afficher les unités"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Fréquence des vérifications"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Lent"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Très lent"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Température élevée"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 °F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 °F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 °F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Température basse"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130°F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 °F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 °C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 °C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 °C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 °C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 °C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f °F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Température"
 
@@ -6354,6 +6498,31 @@ msgstr "Retour"
 msgid "Choose Language"
 msgstr "Choix de la langue"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Votre batterie est presque vide.<br>Vous devriez vous branchez sur le "
+#~ "secteur."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "MAUVAIS PILOTE"
+
+#~ msgid "FULL"
+#~ msgstr "PLEINE"
+
+#~ msgid "High"
+#~ msgstr "Elevée"
+
+#~ msgid "Low"
+#~ msgstr "Faible"
+
+#~ msgid "Danger"
+#~ msgstr "Danger"
+
+#~ msgid "Charging"
+#~ msgstr "En charge"
+
 #~ msgid "NO INFO"
 #~ msgstr "PAS D'INFORMATION"
 
@@ -6544,9 +6713,6 @@ msgstr "Choix de la langue"
 #~ msgid "Armenian"
 #~ msgstr "Arménien"
 
-#~ msgid "Interlingua"
-#~ msgstr "Interlingua"
-
 #~ msgid "Indonesian"
 #~ msgstr "Indonésien"
 
@@ -7949,9 +8115,6 @@ msgstr "Choix de la langue"
 #~ msgid "Use Icon Theme"
 #~ msgstr "Utiliser le thème d'icône"
 
-#~ msgid "Icon Class"
-#~ msgstr "Classe d'icône"
-
 #~ msgid "Misc"
 #~ msgstr "Autre"
 
diff --git a/po/hu.gmo b/po/hu.gmo
index 7eb458b..7318956 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index d64ebf4..b745efb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,31 +1,33 @@
-# Enlightenment Hungarian translation.
-# This file is put in the public domain.
-# Peter Párkányi <peter.parkanyi at gmail.com>, 2006.
+# translation of hu.po to hungarian
+# Copyright (C) YEAR Enlightenment development team
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Lisovszki  <lisovszki at gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Enlightenment DR17\n"
+"Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2006-05-13 14:34+0200\n"
-"Last-Translator: Peter Parkanyi \n"
-"Language-Team: Hungarian <HU at li.org>\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-03-10 17:39+0100\n"
+"Last-Translator: Lisovszki  <lisovszki at gmail.com>\n"
+"Language-Team: hungarian <hu at 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=2; plural=(n != 1);\n"
 
 #: src/bin/e_about.c:66
 msgid "About Enlightenment"
 msgstr "Az Enlightenmentrõl"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:79
-#, fuzzy
 msgid ""
 "Copyright &copy; 1999-2007, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
@@ -36,18 +38,18 @@ msgid ""
 "is not stable. Many features are incomplete or even non-existant yet and may "
 "have many bugs. You have been <hilight>WARNED!</hilight>"
 msgstr ""
-"Copyright &copy; 1999-2005, Enlightenment Development Team-tõl."
+"Copyright &copy; 1999-2005, Enlightenment Fejlesztői csapattól."
 "<br><br>Reméljük, legalább annyira élvezed a program használatát, mint "
 "amennyire mi élveztük a készítését!<br><br>A szoftver használata során "
 "észlelt hibákért felelõsséget nem vállalunk! A program használatának "
 "feltételeit a COPYING és COPYING-PLAIN fájlok tartalmazzák.<br><br>Az "
-"Enlightenment 0.17 <hilight>AKTíV FEJLESZTéS</hilight> alatt áll, és nem "
+"Enlightenment 0.17 <hilight>AKTíV FEJLESZTÉS</hilight> alatt áll, és nem "
 "feltétlen stabil. Sok funkció még hiányzik, vagy nem használható. "
 "<hilight>FIGYELMEZTETTüNK!</hilight>"
 
 #: src/bin/e_about.c:104
 msgid "<title>The Team</title>"
-msgstr "<title>A Csapat<title><br>"
+msgstr "<title>A csapat</title>"
 
 #: src/bin/e_actions.c:312
 #, c-format
@@ -56,23 +58,25 @@ msgid ""
 "window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
 "you want to kill this window?"
 msgstr ""
+"Be akarod zárni a(z) %s-t.<br><br>Kérlek tartsd észben, hogy az ablak összes "
+"adata, <br>amelyek még nem lettek elmentve, el fognak veszni!"
+"<br><br>Biztosan be szeretnéd zárni ezt az ablakot?"
 
 #: src/bin/e_actions.c:324
-#, fuzzy
 msgid "Are you sure you want to kill this window?"
-msgstr "Tényleg ki akarsz lépni?"
+msgstr "Tényleg be akarod zárni ezt az ablakot?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Igen"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Nem"
 
@@ -88,403 +92,363 @@ msgstr ""
 "akarod?"
 
 #: src/bin/e_actions.c:1664
-#, fuzzy
 msgid "Are you sure you want to log out?"
 msgstr "Tényleg ki akarsz lépni?"
 
 #: src/bin/e_actions.c:1666
-#, fuzzy
 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:1723 src/bin/e_actions.c:1841
-#, fuzzy
 msgid "Are you sure you want to turn off?"
-msgstr "Tényleg ki akarsz lépni?"
+msgstr "Tényleg ki akarod kapcsolni a gépet?"
 
 #: src/bin/e_actions.c:1725
-#, fuzzy
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"A számítógép kikapcsolását választottad.<br><br>Biztosan ki akarod kapcsolni?"
 
 #: src/bin/e_actions.c:1782
-#, fuzzy
 msgid "Are you sure you want to reboot?"
-msgstr "Tényleg ki akarsz lépni?"
+msgstr "Biztosan újra akarod indítani?"
 
 #: src/bin/e_actions.c:1784
-#, fuzzy
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"A számítógép újraindítását választottad.<br><br>Biztos, hogy ezt akarod?"
 
 #: src/bin/e_actions.c:1843
-#, fuzzy
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"Az számítógép felfüggesztését választottad.<br><br>Biztos, hogy ezt akarod?"
 
 #: src/bin/e_actions.c:1900
-#, fuzzy
 msgid "Are you sure you want to hibernate?"
-msgstr "Tényleg ki akarsz lépni?"
+msgstr "Tényleg hibernálni akarod a gépet?"
 
 #: src/bin/e_actions.c:1902
-#, fuzzy
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"A számítógép hibernálását választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
-msgstr "Ablak : Akciók"
+msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:1980
-#, fuzzy
+#: src/bin/e_actions.c:1981
 msgid "Move"
-msgstr "Fel"
+msgstr "Mozgatás"
 
-#: src/bin/e_actions.c:1990
-#, fuzzy
+#: src/bin/e_actions.c:1991
 msgid "Resize"
-msgstr "Ellenállás"
+msgstr "Átméretezés"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Ablak menü"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
-msgstr "Felemel"
+msgstr "Felemelés"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
-msgstr "Lejjebb helyez"
+msgstr "Alsó"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
-msgstr "Nyírd ki!"
-
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+msgstr "Kilövés"
+
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Ablak : Állapot"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
-msgstr "Ragadós mód váltása"
+msgstr "Ragadós módra vált"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
-msgstr "Ikon mód váltása"
+msgstr "Ikonizált módra vált"
 
-#: src/bin/e_actions.c:2042
-#, fuzzy
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
-msgstr "Ikon mód váltása"
+msgstr "Teljes képernyő módra vált"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
-msgstr "Teljes méretû"
+msgstr "Maximalizálás"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
-msgstr "Függõlegesen maximalizál"
+msgstr "Maximalizálás függőlegesen"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
-msgstr "Vízszintesen maximalizál"
+msgstr "Maximalizálás vízszintesen"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
-msgstr "Teljes képernyõs"
+msgstr "Teljes képernyő maximalizálás"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
-msgstr "Maximalizálási mód \"Okos\""
+msgstr "Maximalizálási mód \"Intelligens\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
-msgstr "Maximalizálási mód \"Kiterjeszt\""
+msgstr "Maximalizálási mód \"Kitöltés\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
-msgstr "Maximalizálási mód \"Kitölt\""
+msgstr "Maximalizálási mód \"Bőséges\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
-msgstr "Felgördítés váltása"
+msgstr "Felgördítés fel módra vált"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
-msgstr "Legördítés váltása"
+msgstr "Felgördítés le módra vált"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
-msgstr "Balraragördítés váltása"
+msgstr "Felgördítés balra módra vált"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
-msgstr "Jobbragördítés váltása"
+msgstr "Felgördítés jobbra módra vált"
 
-#: src/bin/e_actions.c:2078
-#, fuzzy
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
-msgstr "Felgördítés váltása"
+msgstr "Felgördítés módra vált"
 
-#: src/bin/e_actions.c:2085
-#, fuzzy
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
-msgstr "Keret nélküli"
+msgstr "Szegély nélküli állapotra vált"
 
-#: src/bin/e_actions.c:2090
-#, fuzzy
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
-msgstr "Keret nélküli"
-
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+msgstr "Rögzített állapotra vált"
+
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
-msgstr "Asztal"
+msgstr "Munkaasztal"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
-msgstr "Váltás a bal oldali asztalra"
+msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
-msgstr "Váltás a jobb oldali asztalra"
+msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
-msgstr "Váltás a feljebbi sztalra"
+msgstr "Asztal váltás fel"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
-msgstr "Váltása a lejjebbi asztalra"
+msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
-msgstr "Asztalváltás ennyivel..."
+msgstr "Asztal váltás ezzel..."
 
-#: src/bin/e_actions.c:2109
-#, fuzzy
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
-msgstr "Ez az asztal"
+msgstr "Munkaasztal megjelenítése"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
-msgstr "Váltás erre az asztalra..."
+msgstr "Asztal váltása ide..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
-msgstr "Lineáris asztalváltás"
+msgstr "Vízszintes asztal váltás..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
-msgstr "Váltás a 0 asztalra"
+msgstr "Váltás a 0-ás asztalra"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
-msgstr "Váltás a 1 asztalra"
+msgstr "Váltás az 1-es asztalra"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
-msgstr "Váltás a 2 asztalra"
+msgstr "Váltás a 2-es asztalra"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
-msgstr "Váltás a 3 asztalra"
+msgstr "Váltás a 3-as asztalra"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
-msgstr "Váltás a 4 asztalra"
+msgstr "Váltás a 4-es asztalra"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
-msgstr "Váltás a 5 asztalra"
+msgstr "Váltás az 5-ös asztalra"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
-msgstr "Váltás a 6 asztalra"
+msgstr "Váltás a 6-os asztalra"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
-msgstr "Váltás a 7 asztalra"
+msgstr "Váltás a 7-es asztalra"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
-msgstr "Váltás a 8 asztalra"
+msgstr "Váltás a 8-as asztalra"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
-msgstr "Váltás a 9 asztalra"
+msgstr "Váltás a 9-es asztalra"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
-msgstr "Váltás a 10 asztalra"
+msgstr "Váltás a 10-es asztalra"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
-msgstr "Váltás a 11 asztalra"
+msgstr "Váltás a 11-es asztalra"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2156
-#, fuzzy
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Váltás a bal oldali asztalra"
+msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2158
-#, fuzzy
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Váltás a jobb oldali asztalra"
+msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2160
-#, fuzzy
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Váltás a feljebbi sztalra"
+msgstr "Asztal válát fel"
 
-#: src/bin/e_actions.c:2162
-#, fuzzy
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Váltása a lejjebbi asztalra"
+msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2164
-#, fuzzy
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Asztalváltás ennyivel..."
 
-#: src/bin/e_actions.c:2170
-#, fuzzy
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2176
-#, fuzzy
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Lineáris asztalváltás"
 
-#: src/bin/e_actions.c:2182
-#, fuzzy
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Váltás a 0 asztalra"
+msgstr "Váltás a 0. asztalra"
 
-#: src/bin/e_actions.c:2184
-#, fuzzy
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Váltás a 1 asztalra"
+msgstr "Váltás a 1. asztalra"
 
-#: src/bin/e_actions.c:2186
-#, fuzzy
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Váltás a 2 asztalra"
+msgstr "Váltás a 2. asztalra"
 
-#: src/bin/e_actions.c:2188
-#, fuzzy
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Váltás a 3 asztalra"
 
-#: src/bin/e_actions.c:2190
-#, fuzzy
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Váltás a 4 asztalra"
+msgstr "Váltás a 4. asztalra"
 
-#: src/bin/e_actions.c:2192
-#, fuzzy
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Váltás a 5 asztalra"
+msgstr "Váltás a 5. asztalra"
 
-#: src/bin/e_actions.c:2194
-#, fuzzy
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Váltás a 6 asztalra"
+msgstr "Váltás a 6. asztalra"
 
-#: src/bin/e_actions.c:2196
-#, fuzzy
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Váltás a 7 asztalra"
+msgstr "Váltás a 7. asztalra"
 
-#: src/bin/e_actions.c:2198
-#, fuzzy
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Váltás a 8 asztalra"
+msgstr "Váltás a 8. asztalra"
 
-#: src/bin/e_actions.c:2200
-#, fuzzy
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Váltás a 9 asztalra"
+msgstr "Váltás a 9. asztalra"
 
-#: src/bin/e_actions.c:2202
-#, fuzzy
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Váltás a 10 asztalra"
+msgstr "Váltás a 10. asztalra"
 
-#: src/bin/e_actions.c:2204
-#, fuzzy
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Váltás a 11 asztalra"
+msgstr "Váltás a 11. asztalra"
 
-#: src/bin/e_actions.c:2206
-#, fuzzy
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -492,159 +456,152 @@ msgstr "Váltás erre az asztalra..."
 #: src/modules/conf_screensaver/e_mod_main.c:34
 #: src/modules/ibox/e_mod_config.c:110
 msgid "Screen"
-msgstr "Képernyõ"
+msgstr "Képernyő"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
-msgstr ""
+msgstr "Az egér küldése a 0-ás képernyőre"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
-msgstr ""
+msgstr "Az egér küldése a 1-es képernyőre"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
-msgstr ""
+msgstr "Egér küldése erre a képernyőre..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
-msgstr ""
+msgstr "Egér küldése előre 1 képernyőt"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
-msgstr ""
+msgstr "Egér vissza 1 képernyőt"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
-msgstr ""
+msgstr "Egér küldése előre/Vissza képernyőket..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
-msgstr "Ablak : Mozgás"
+msgstr "Ablak : Mozgatás"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "A következő asztalra"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
-msgstr "Az előző asztal"
+msgstr "Az előző asztalra"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
-msgstr "Ehhez az aszatlhoz #..."
+msgstr "#... Asztal által..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Erre az asztalra..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
-msgstr "Főmenü megjelenítése"
+msgstr "Saját Menü mutatása"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Kedvencek menü megjelenítése"
 
-#: src/bin/e_actions.c:2280
-#, fuzzy
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
-msgstr "Ablakok menü megjelenítése"
+msgstr "Minden alkalmazás menü megjelenítése"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Ablakok menü megjelenítése"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Menü megjelenítése..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
-msgstr ""
+msgstr "Indítás"
 
-#: src/bin/e_actions.c:2291
-#, fuzzy
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
-msgstr "Parancs futtatása"
+msgstr "Megadott parancs"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
-msgstr "Kkilépés"
+msgstr "Kilépés"
 
-#: src/bin/e_actions.c:2308
-#, fuzzy
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
-msgstr "Kinézet"
+msgstr "Kijelentkezés"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
-msgstr ""
+msgstr "Kilépés azonnal"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Rendszer"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
-msgstr ""
+msgstr "Leállítás"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
-msgstr ""
+msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
-msgstr ""
+msgstr "Felfüggesztés"
 
-#: src/bin/e_actions.c:2328
-#, fuzzy
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
-msgstr "Küldd erre az asztalra"
+msgstr "Felfüggesztés lemezre"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Asztal zárolása"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Ablakok tisztogatása"
 
 #: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
-#, fuzzy
 msgid "Set As Background"
-msgstr "Háttér beállítása erre"
+msgstr "Beállítás háttérként"
 
-#: src/bin/e_border.c:4429
-#, fuzzy
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
-msgstr "Asztal"
+msgstr "Desktop fájlok keresése kész"
 
-#: src/bin/e_border.c:4441
-#, fuzzy
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
-msgstr "Asztal"
+msgstr "Desktop fájl keresés"
 
 #: src/bin/e_config.c:593
 msgid ""
@@ -656,13 +613,12 @@ 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 ""
-"A beállításokat tartalmazó állományok elvultak, ezért<br>újakat kellett "
-"készíteni. Minden eddigi beállítás törlõdött,<br>de ez a felylesztés "
-"folyamán gyakran megesik majd. KéRüNK,<br>HOGY NE JELENTS HIBáT! Annyi "
-"történt, hogy a használhatóság<br>érdekében az Enlighenmentnek ú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>"
+"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 Enlighenmentnek ú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/bin/e_config.c:607
 msgid ""
@@ -683,19 +639,22 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Asztal %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "A beállításokat frissítettem!"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
 "error could not be<br>deterimined.<br><br>The file where the error occured "
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
+"Hiba történt az Enlightenment <br>beállításainak a lemezre mentése közben. A "
+"hiba nem hozható helyre<br>.<br><br>A fájl ahol a hiba keletkezett:<br>%"
+"s<br> A fájl törlésre kerül.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -704,8 +663,13 @@ msgid ""
 "<br><br>The file where the error occured was:<br>%s<br><br>This file has "
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
+"Az Enlightenment konfigurációs fájlja túl nagy ahhoz a <br>fájlrendszerhez "
+"képest, ahová mentve lett.<br>. Ez a hiba nagyon furcsa, mert a fájloknak "
+"<br> sokkal kissebnek kell lennie. Kérlek ellenőrizd a <br> home könyvtárad "
+"beállításait. <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.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -713,8 +677,12 @@ msgid ""
 "replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
+"Hiba történt az Enlightenment konfigurációs fájljainak<br> írása közben. "
+"Problémák lehetnem a lemezeddel,<br> valószínüleg áthelyezést igényel."
+"<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.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -722,27 +690,31 @@ msgid ""
 "have<br>gone over your quota limit.<br><br>The file where the error occured "
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
+"Nem tudom elmenteni a konfigurációs fájlt, <br>mert nincs elég hely hozzá."
+"<br> Vagy nincs elég hely a lemezeden, vagy <br>nincs jogosultásgod írni rá."
+"<br><br> A hiba helye:<br>%s<br><br> A fájlt törölve lett.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
 "closed on it. This is very unusual.<br><br>The file where the error occured "
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
+"Az Enlightenment konfigurációs fájl az írás közben <br>váratlanul "
+"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.c:2306
-#, fuzzy
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
-msgstr "Az Enlightenment beállítása"
+msgstr "Enlightenment konfiguráció írási problémák"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -751,21 +723,22 @@ msgstr "Az Enlightenment beállítása"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
-msgstr "Haladó"
+msgstr "Speciális"
 
 #: src/bin/e_config_dialog.c:204
 msgid "Basic"
@@ -773,48 +746,50 @@ msgstr "Alap"
 
 #: src/bin/e_config_dialog.c:219
 msgid "Apply"
-msgstr "Elfogadom"
+msgstr "Alkalmaz"
 
 #: src/bin/e_configure.c:8 src/modules/conf_shelves/e_mod_main.c:38
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Modulok"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
-msgstr "Tároló %d"
+msgstr "%d tároló"
 
 #: src/bin/e_desklock.c:143
 msgid "Error - no PAM support"
-msgstr ""
+msgstr "Hiba - nincs PAM támogatás"
 
 #: src/bin/e_desklock.c:144
 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:210
 msgid "Lock Failed"
-msgstr "Nem tudtam zárolni a képernyõt!"
+msgstr "Zárolás nem sikerült!"
 
 #: src/bin/e_desklock.c:211
 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 ""
-"Nem tudtam az aztalt zárolni, mert egy alkalmazás<br>használja az egeret "
+"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:297
 msgid "Please enter your unlock password"
-msgstr "Kérlek írd be a jelszót"
+msgstr "Kérlek írd be a feloldási jelszavad"
 
 #: src/bin/e_desklock.c:639
 msgid "Authentication System Error"
@@ -831,9 +806,8 @@ msgstr ""
 "így nem jó, és nem kellene megtörténnie. Kérlek jelentsd ezt a hibát!"
 
 #: src/bin/e_eap_editor.c:156
-#, fuzzy
 msgid "Incomplete Window Properties"
-msgstr "Ikon tulajdonságainak megváltoztatása"
+msgstr "Teljesítetlen ablak beállítások"
 
 #: src/bin/e_eap_editor.c:157
 msgid ""
@@ -843,13 +817,17 @@ 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 ""
+"Az ablak, amihez az ikont készíted, <br> nem tartalmazza az ablak név és "
+"osztály <br> információit, az ikon információi lesznek <br> használva, nem "
+"lesz megkérdezve.<br> Az ablak címét kell használniod, mert a beállítások, "
+"csak akkor működnek, ha megegyezik az blak és z ikon neve."
 
 #: src/bin/e_eap_editor.c:210
 msgid "Desktop Entry Editor"
-msgstr ""
+msgstr "Munkaasztal bejegyzés szerkesztő"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikon"
@@ -861,13 +839,12 @@ msgstr "Alap információk"
 
 #: src/bin/e_eap_editor.c:456 src/bin/e_int_border_prop.c:420
 #: src/bin/e_int_border_prop.c:467 src/modules/conf_imc/e_int_config_imc.c:907
-#, fuzzy
 msgid "Name"
-msgstr "Név szerint"
+msgstr "Név"
 
 #: src/bin/e_eap_editor.c:462
 msgid "Executable"
-msgstr "Bináris"
+msgstr "Futtatható program"
 
 #: src/bin/e_eap_editor.c:470
 msgid "Comment"
@@ -878,57 +855,50 @@ msgid "General"
 msgstr "Általános"
 
 #: src/bin/e_eap_editor.c:498
-#, fuzzy
 msgid "Generic Name"
-msgstr "Általános információk"
+msgstr "Általános név"
 
 #: src/bin/e_eap_editor.c:503
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:105
 msgid "Window Class"
 msgstr "Ablak osztály"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
-msgstr ""
+msgstr "Kategóriák"
 
 #: src/bin/e_eap_editor.c:511
-#, fuzzy
 msgid "Mime Types"
-msgstr "Fájl"
+msgstr "Mime Típus"
 
 #: src/bin/e_eap_editor.c:517
-#, fuzzy
 msgid "Options"
 msgstr "Beállítások"
 
 #: src/bin/e_eap_editor.c:518
 msgid "Startup Notify"
-msgstr "Indításkor figyelmeztet"
+msgstr "Indulás"
 
 #: src/bin/e_eap_editor.c:520
 msgid "Run in Terminal"
-msgstr ""
+msgstr "Futtatás terminálban"
 
 #: src/bin/e_eap_editor.c:522
-#, fuzzy
 msgid "Show in Menus"
-msgstr "Főmenü megjelenítése"
+msgstr "Megjelenítés a menükben"
 
 #: src/bin/e_eap_editor.c:526
-#, fuzzy
 msgid "Desktop file"
-msgstr "Asztal"
+msgstr "Desktop fájl"
 
 #: src/bin/e_eap_editor.c:527
-#, fuzzy
 msgid "Filename"
-msgstr "Átnevez"
+msgstr "Fájlnév"
 
 #: src/bin/e_eap_editor.c:556
-#, fuzzy
 msgid "Select an Icon"
-msgstr "Válassz egy ablakot!"
+msgstr "Válassz egy ikont"
 
 #: src/bin/e_eap_editor.c:598 src/bin/e_eap_editor.c:662
 #: src/bin/e_entry_dialog.c:59 src/bin/e_fm_prop.c:514
@@ -938,48 +908,45 @@ msgstr "Válassz egy ablakot!"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
-msgstr "Mégse"
+msgstr "Mégsem"
 
 #: src/bin/e_eap_editor.c:625
-#, fuzzy
 msgid "Select an Executable"
-msgstr "Másik kép kiválasztása"
+msgstr "Egy futtatható kiválasztása"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:111
 msgid "Delete"
-msgstr "Töröl"
+msgstr "Törlés"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
-#, fuzzy
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
-msgstr "Kivág"
+msgstr "Kivágás"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
-msgstr "Másol"
+msgstr "Másolás"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
-#, fuzzy
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
-msgstr "Gyakran"
+msgstr "Beillesztés"
 
 #: src/bin/e_entry.c:517
-#, fuzzy
 msgid "Select All"
-msgstr "Töröl"
+msgstr "Mindent kijelöl"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Futási hiba"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
@@ -987,222 +954,217 @@ 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Hiba az alkalmazás futtatásakor"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "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:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Hiba az alkalmazás végrehajtásakor"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s váratlanul befejezte mûködését."
 
-#: src/bin/e_exec.c:425
-#, fuzzy, c-format
+#: src/bin/e_exec.c:430
+#, c-format
 msgid "An exit code of %i was returned from %s."
-msgstr "%i kilépési értékkel tért vissza a %s"
+msgstr "%i kilépési értékkel tért vissza a %s-től."
 
-#: src/bin/e_exec.c:432
-#, fuzzy, c-format
+#: src/bin/e_exec.c:437
+#, c-format
 msgid "%s was interrupted by an Interrupt Signal."
-msgstr "%s futtatását megszakította egy Interrupt szignál"
+msgstr "%s futtatását megszakította egy megszakítót jel."
 
-#: src/bin/e_exec.c:434
-#, fuzzy, c-format
+#: src/bin/e_exec.c:439
+#, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr "%s futtatását megszakította egy kilépés szignál"
+msgstr "%s futtatását megszakította egy kilépés jel."
 
-#: src/bin/e_exec.c:438
-#, fuzzy, c-format
+#: src/bin/e_exec.c:443
+#, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s futtatását megszakította egy elvetõ szignál"
+msgstr "%s futtatását megszakította egy elvetõ jel."
 
-#: src/bin/e_exec.c:441
-#, fuzzy, c-format
+#: src/bin/e_exec.c:446
+#, 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:444
-#, fuzzy, c-format
+#: src/bin/e_exec.c:449
+#, 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:447
-#, fuzzy, c-format
+#: src/bin/e_exec.c:452
+#, c-format
 msgid "%s was interrupted by a Segmentation Fault."
-msgstr "%s futtatása megszakadt szegmenshiba miatt"
+msgstr "%s futtatása megszakadt szegmens hiba miatt"
 
-#: src/bin/e_exec.c:450
-#, fuzzy, c-format
+#: src/bin/e_exec.c:455
+#, 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:453
-#, fuzzy, c-format
+#: src/bin/e_exec.c:458
+#, 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:456
-#, fuzzy, c-format
+#: src/bin/e_exec.c:461
+#, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s futtatása megszakadt bus hiba miatt"
 
-#: src/bin/e_exec.c:459
-#, fuzzy, c-format
+#: src/bin/e_exec.c:464
+#, 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:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
-msgstr "Hiba Naplók"
+msgstr "Hiba bejegyzések"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
-msgstr "Nem volt hibaüzenet"
+msgstr "Nem volt hibaüzenet."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
-msgstr "Mentsd ezt az üzenetet"
+msgstr "Mentsd el ezt az üzenetet"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
-msgstr ""
+msgstr "A hiba bejegyzés elmentbe ide: %s/%s.log"
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Hiba információ"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Hiba szignál információk"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Kimeneti adat"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Nem volt kimenet"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
-msgstr ""
-
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
-msgstr ""
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
+msgstr "Nem létező útvonal"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:515
 #, fuzzy, c-format
+msgid "%s doesn't exist."
+msgstr "%s nem létezik"
+
+#: src/bin/e_fm.c:2697
+#, c-format
 msgid "%i Files"
-msgstr "Fájl"
+msgstr "%i fájlok"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
-#, fuzzy
 msgid "View Mode"
-msgstr "Kütyük rendezése"
+msgstr "Nézetmód"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
-#, fuzzy
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
-msgstr "Fríssítési gyakoriság"
+msgstr "A nézet frissítése"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
-msgstr ""
+msgstr "Rejtett fájlok megjelenítése"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
-#, fuzzy
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
-msgstr "Ezek alapján emlékezz:"
+msgstr "Emlékezz az utasításokra"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
-msgstr ""
+msgstr "Rendezés Most"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Új könyvtár"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
-msgstr "Átnevez"
+msgstr "Átnevezés"
 
-#: src/bin/e_fm.c:6538
-#, fuzzy
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Ikonok"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
-#, fuzzy
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
-msgstr "Ablaklista"
+msgstr "Lista"
 
-#: src/bin/e_fm.c:6845
-#, fuzzy
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
-msgstr "Új könyvtár"
+msgstr "Új könyvtár létrehozása"
 
-#: src/bin/e_fm.c:6846
-#, fuzzy
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
-msgstr "Új könyvtár"
+msgstr "Új könyvtár neve:"
 
-#: src/bin/e_fm.c:6905
-#, fuzzy, c-format
+#: src/bin/e_fm.c:6915
+#, c-format
 msgid "Rename %s to:"
-msgstr "Átnevez"
+msgstr "%s átnevezése erre:"
 
-#: src/bin/e_fm.c:6907
-#, fuzzy
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
-msgstr "Átnevez"
+msgstr "Fájl átnevezése"
 
-#: src/bin/e_fm.c:7005
-#, fuzzy
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
-msgstr "Megerõsít"
+msgstr "A törlés megerősítése"
 
-#: src/bin/e_fm.c:7009
-#, fuzzy, c-format
+#: src/bin/e_fm.c:7019
+#, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
-msgstr "Biztosan törölni akarod a <br><b>%s</b> nevû fájlt?"
+msgstr "Biztosan törölni akarod a(z) <br><hilight>%s</hilight> nevû fájlt?"
 
-#: src/bin/e_fm.c:7015
-#, fuzzy, c-format
+#: src/bin/e_fm.c:7025
+#, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
-msgstr "Biztosan törölni akarod a <br><b>%s</b> nevû fájlt?"
+msgstr ""
+"Biztosan törölni akarod<br> a %d kiválasztott fájlokat innen:<br><hilight>%"
+"s</hilight>?"
 
 #: src/bin/e_fm_prop.c:108
-#, fuzzy
 msgid "File Properties"
-msgstr "Tulajdonságok"
+msgstr "Fájljellemzők"
 
 #: src/bin/e_fm_prop.c:338
 msgid "File:"
@@ -1213,19 +1175,16 @@ msgid "Size:"
 msgstr "Méret:"
 
 #: src/bin/e_fm_prop.c:352
-#, fuzzy
 msgid "Last Modified:"
 msgstr "Utoljára módosítva:"
 
 #: src/bin/e_fm_prop.c:359
-#, fuzzy
 msgid "File Type:"
-msgstr "Fájl"
+msgstr "Fájl típus:"
 
 #: src/bin/e_fm_prop.c:366
-#, fuzzy
 msgid "Permissions"
-msgstr "Jogok:"
+msgstr "Jogosultságok"
 
 #: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:339
 msgid "Owner:"
@@ -1233,101 +1192,97 @@ msgstr "Tulajdonos:"
 
 #: src/bin/e_fm_prop.c:373
 msgid "Others can read"
-msgstr ""
+msgstr "Bárki olvashatja"
 
 #: src/bin/e_fm_prop.c:375
 msgid "Others can write"
-msgstr ""
+msgstr "Bárki írhatja"
 
 #: src/bin/e_fm_prop.c:377
 msgid "Owner can read"
-msgstr ""
+msgstr "Tulajdonos olvashatja"
 
 #: src/bin/e_fm_prop.c:379
 msgid "Owner can write"
-msgstr ""
+msgstr "Tulajdonos írhatja"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
-msgstr ""
+msgstr "Előnézet"
 
 #: src/bin/e_fm_prop.c:432
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:164
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:174
-#, fuzzy
 msgid "Default"
-msgstr "Alapértelmezett asztal"
+msgstr "Alapértelmezett"
 
 #: src/bin/e_fm_prop.c:435
 msgid "Thumbnail"
-msgstr ""
+msgstr "Előnézeti kép"
 
 #: src/bin/e_fm_prop.c:438
 #: src/modules/conf_desklock/e_int_config_desklock.c:312
-#, fuzzy
 msgid "Custom"
-msgstr "Kivág"
+msgstr "Egyéni"
 
 #: src/bin/e_fm_prop.c:448
 msgid "Use this icon for all files of this type"
-msgstr ""
+msgstr "Használd ezt az ikont az összes ilyen fájltípushoz"
 
 #: src/bin/e_fm_prop.c:456
-#, fuzzy
 msgid "Link Information"
-msgstr "Hiba információ"
+msgstr "Link információ"
 
 #: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
-#, fuzzy
 msgid "Select an Image"
-msgstr "Másik kép kiválasztása"
+msgstr "Válassz egy képet"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
-msgstr ""
+msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
-msgstr ""
+msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
-msgstr ""
+msgstr "%llu MeB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
-msgstr ""
+msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
-msgstr ""
+msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
-#, fuzzy, c-format
+#: src/bin/e_fm_hal.c:251
+#, c-format
 msgid "Unknown Volume"
-msgstr "Ismeretlen"
+msgstr "Ismeretlen érték"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
-msgstr ""
+msgstr "Cserélhető adathordozójú eszköz"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
-msgstr "Sima"
+msgstr "Egyszerű"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Beágyazott"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1339,47 +1294,48 @@ msgstr "Beágyazott"
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Appearance"
-msgstr "Kinézet"
+msgstr "Megjelenés"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Tartalom automatikus görgetése"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Átméretezhetõ"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
-msgstr ""
+msgstr "Modul áthelyezésének/átméretezésének kezdése"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
-msgstr ""
+msgstr "Modul eltávolítása"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
-msgstr ""
+msgstr "Modul áthelyezésének/átméretezésének leállítása"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
 msgstr ""
+"Egy előző Enlightenment folyamat még aktív\n"
+"ezen a képernyőn. Indítás megszakítása.\n"
 
 #: src/bin/e_init.c:297
 #, c-format
 msgid "X reports there are no root windows and %i screens!\n"
-msgstr "Nincs gyökér ablak és %i képernyõk!\n"
+msgstr "Az X jelenti, hogy nincsenek root ablakok és %i képernyők!\n"
 
 #: src/bin/e_init.c:361
 msgid "Disable this splash screen in the future?"
-msgstr "Megjelenjen ez a képernyõ a jövõben is?"
+msgstr "Letiltod ezt az indító képernyőt a jövőben?"
 
 #: src/bin/e_init.c:558
-#, fuzzy
 msgid "Theme Bug Detected"
-msgstr "Témakezelõ"
+msgstr "Téma hibát találtam"
 
 #: src/bin/e_init.c:559
 msgid ""
@@ -1387,14 +1343,17 @@ msgid ""
 "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 ""
+"A téma, amit az indításhoz használsz, <br>hibás. Nem nem küld visszajelzést, "
+"amikor az<br>indítás befejeződött. Használj egy másik<br>indító témát, ami "
+"jó, vagy javítsd ki a hibát a jelenlegi témában<br>."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
-msgstr "Ablak szabályok"
+msgstr "Ablak zárolások"
 
 #: src/bin/e_int_border_locks.c:285
 msgid "Generic Locks"
-msgstr "Általános szabályok"
+msgstr "Általános zárolások"
 
 #: src/bin/e_int_border_locks.c:286
 msgid "Lock the Window so it does only what I tell it to"
@@ -1407,7 +1366,7 @@ msgstr "Védd meg az ablakot, nehogy véletlenül megváltoztassam!"
 #: src/bin/e_int_border_locks.c:290
 msgid ""
 "Protect this window from being accidentally closed because it is important"
-msgstr "Védd meg az ablkakot, nehogy véletlen bezárjam!"
+msgstr "Védd meg az ablkakot, nehogy véletlen bezárjam, mert fontos!"
 
 #: src/bin/e_int_border_locks.c:292
 msgid "Do not allow the border to change on this window"
@@ -1415,48 +1374,48 @@ msgstr "Ne engedélyezd a keret megváltoztatását ezen az ablakon!"
 
 #: src/bin/e_int_border_locks.c:295
 msgid "Remember these Locks for this window next time it appears"
-msgstr "Ha újra megjelenik az ablak, emlékezz majd a szabályokra!"
+msgstr "Ha újra megjelenik az ablak, emlékezz majd a zárolásokra!"
 
 #: src/bin/e_int_border_locks.c:308
 msgid "Lock program changing:"
 msgstr "Ne változtathassa meg a program:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
-msgstr "Hely"
+msgstr "Pozíció"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Méret"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
-msgstr "Csoportosítás"
+msgstr "Halomba rakás"
 
 #: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
 msgid "Iconified state"
 msgstr "Ikonizált állapot"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Ragadósság"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Árnyékoltság"
 
 #: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
 msgid "Maximized state"
-msgstr "Teljes képernyõs állapot"
+msgstr "Maximalizált állapot"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
 msgid "Fullscreen state"
@@ -1466,7 +1425,7 @@ msgstr "Teljes képernyõs állapot"
 msgid "Lock me from changing:"
 msgstr "Ne változtathassam meg:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Keret stílus"
 
@@ -1484,295 +1443,270 @@ msgstr "Kijelentkezni, ha ez az ablak nyitva van"
 
 #: src/bin/e_int_border_locks.c:355
 msgid "Remember these Locks"
-msgstr "Emlékezzen a szabályokra"
+msgstr "Emlékezzen a zárolásokra"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
-msgstr "Mindig a legfelül"
+msgstr "Mindig legfelül"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
-msgstr "Általános"
+msgstr "Normál"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
-msgstr "Mindig a legalul"
+msgstr "Mindig alul"
 
-#: src/bin/e_int_border_menu.c:118
-#, fuzzy
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Teljes méretû függõlegesen"
 
-#: src/bin/e_int_border_menu.c:129
-#, fuzzy
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Teljes méretû vízszintesen"
 
-#: src/bin/e_int_border_menu.c:140
-#, fuzzy
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
-msgstr "Teljes méretû"
+msgstr "Kicsinyítés"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
-msgstr "Emlékezés"
+msgstr "Megjegyez"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
-msgstr "Keret"
+msgstr "Szegély"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Küldd erre az asztalra"
 
-#: src/bin/e_int_border_menu.c:201
-#, fuzzy
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
-msgstr "Küldd erre az asztalra"
+msgstr "Tüzd erre az asztalra"
 
-#: src/bin/e_int_border_menu.c:213
-#, fuzzy
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
-msgstr "Küldd erre az asztalra"
+msgstr "Vedd el erről az asztalról"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
-#, fuzzy
 msgid "State"
-msgstr "Indítás"
+msgstr "Állapot"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
-msgstr ""
+msgstr "Kihagyás"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
-msgstr "Ikon módosítása"
+msgstr "Ikon szerkesztése"
 
-#: src/bin/e_int_border_menu.c:275
-#, fuzzy
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
-msgstr "Kedvencek menü megjelenítése"
+msgstr "Add hozá a kedvencek menühöz"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
-msgstr ""
+msgstr "Adj hozzá gyorbillentyűt"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
-msgstr ""
+msgstr "Add hozzá az indítóhoz"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Ikon készítése"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
-#, fuzzy
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
-msgstr "Tulajdonságok"
+msgstr "Ablak tulajdonságok"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
-msgstr "Ikonizáld"
+msgstr "Ikonméret"
 
-#: src/bin/e_int_border_menu.c:826
-#, fuzzy
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
-msgstr "Keret stílus"
+msgstr "Keret stílus kiválasztása"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
-msgstr ""
+msgstr "használd az alapértelmezett E17 ikon beállítást"
 
-#: src/bin/e_int_border_menu.c:847
-#, fuzzy
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Az alkalmazás ikonjának használata"
 
-#: src/bin/e_int_border_menu.c:855
-#, fuzzy
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
-msgstr "Felhasználói akciók"
+msgstr "Felhasználó által megadott ikon használata"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Árnyékolt"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Ragadós"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
-msgstr "Teljes képernyõs"
+msgstr "Teljes képernyő"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Ablaklista"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
 #: src/modules/pager/e_mod_main.c:2846 src/modules/pager/e_mod_main.c:2847
 #: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
 msgid "Pager"
-msgstr "Lapozó"
+msgstr "Csipogó"
+
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Feladatlista kihagyása"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
-msgstr ""
+msgstr "NetWM"
 
 #: src/bin/e_int_border_prop.c:370
 msgid "ICCCM"
-msgstr ""
+msgstr "ICCCM"
 
 #: src/bin/e_int_border_prop.c:418
-#, fuzzy
 msgid "ICCCM Properties"
-msgstr "Tulajdonságok"
+msgstr "ICCCM tulajdonságok"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Cím"
 
 #: src/bin/e_int_border_prop.c:421
-#, fuzzy
 msgid "Class"
-msgstr "Celsius"
+msgstr "Osztály"
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
-#, fuzzy
 msgid "Icon Name"
-msgstr "Ikon méret"
+msgstr "Ikonnév"
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
-msgstr ""
+msgstr "Gép"
 
 #: src/bin/e_int_border_prop.c:424
-#, fuzzy
 msgid "Role"
-msgstr "Törlés"
+msgstr "Szerep"
 
 #: src/bin/e_int_border_prop.c:426
-#, fuzzy
 msgid "Minimum Size"
-msgstr "Min. sebesség"
+msgstr "Minimum méret"
 
 #: src/bin/e_int_border_prop.c:427
-#, fuzzy
 msgid "Maximum Size"
 msgstr "Teljes méretû"
 
 #: src/bin/e_int_border_prop.c:428
-#, fuzzy
 msgid "Base Size"
-msgstr "Polc mérete"
+msgstr "Alap méret"
 
 #: src/bin/e_int_border_prop.c:429
 msgid "Resize Steps"
-msgstr ""
+msgstr "Átméretezési llépések"
 
 #: src/bin/e_int_border_prop.c:431
-#, fuzzy
 msgid "Aspect Ratio"
-msgstr "Alkalmazás"
+msgstr "Képarány"
 
 #: src/bin/e_int_border_prop.c:432
-#, fuzzy
 msgid "Initial State"
-msgstr "Ikonizált állapot"
+msgstr "Kezdeti állapot"
 
 #: src/bin/e_int_border_prop.c:434
-#, fuzzy
 msgid "Window ID"
-msgstr "Ablak"
+msgstr "Ablak azonosító"
 
 #: src/bin/e_int_border_prop.c:435
-#, fuzzy
 msgid "Window Group"
-msgstr "Fókusz"
+msgstr "Ablak csoport"
 
 #: src/bin/e_int_border_prop.c:436
-#, fuzzy
 msgid "Transient For"
-msgstr "Mulandóság"
+msgstr "Célszemély"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr ""
+msgstr "Kliens Vezér"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
-msgstr ""
+msgstr "Gravitáció"
 
 #: src/bin/e_int_border_prop.c:439
-#, fuzzy
 msgid "Command"
-msgstr "Parancs futtatása"
+msgstr "Parancs"
 
 #: src/bin/e_int_border_prop.c:441
-#, fuzzy
 msgid "Take Focus"
-msgstr "Fókusz"
+msgstr "Fókusz megszerzése"
 
 #: src/bin/e_int_border_prop.c:442
 msgid "Accepts Focus"
-msgstr ""
+msgstr "Fókusz"
 
 #: src/bin/e_int_border_prop.c:443
 msgid "Urgent"
-msgstr ""
+msgstr "Sürgős"
 
 #: src/bin/e_int_border_prop.c:444
-#, fuzzy
 msgid "Request Delete"
-msgstr "Töröl"
+msgstr "Törlés Kérés"
 
 #: src/bin/e_int_border_prop.c:445
-#, fuzzy
 msgid "Request Position"
-msgstr "Hely"
+msgstr "Hely kérés"
 
 #: src/bin/e_int_border_prop.c:466
-#, fuzzy
 msgid "NetWM Properties"
-msgstr "Tulajdonságok"
+msgstr "NetWM tulajdonságok"
 
 #: src/bin/e_int_border_prop.c:471
-#, fuzzy
 msgid "Modal"
-msgstr "Modulok"
+msgstr "Kizárólagos"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
-msgstr ""
+msgstr "Feladatlista kihagyása"
 
-#: src/bin/e_int_border_prop.c:475
-#, fuzzy
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
-msgstr "Lapozó"
+msgstr "Lapozó kihagyása"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
-msgstr ""
+msgstr "Rejtett"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Ablak emlékek"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Az ablak tulajdonságai nem egyediek"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1791,15 +1725,15 @@ msgstr ""
 "tulajdonságai átszállnak a többi<br>ablakra is, és az emlékezõ beállítások "
 "is minden ablakra hatnak<br>majd, ami ugyanezekkel a tulajdonságokkal "
 "rendelkezik.<br>Ez csak egy figyelmeztetés, mivel általában ez nem egy jó "
-"ötlet.<br>Ha tényleg ezt akarod, nyomd meg az <hilight>Elfogadom</hilight> "
+"ötlet.<br>Ha tényleg ezt akarod, nyomd meg az <hilight>Alkalmaz</hilight> "
 "vagy <hilight>OK</hilight> gombok egyikét.<br>Ha nem ezt szeretnéd,nyomd meg "
 "a <hilight>Mégse</hilight> gombot, és semmi nem változik majd."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Nincs illeszkedõ tulajdonságtábla"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1810,7 +1744,7 @@ msgstr ""
 "anélkül, hogy megadnád, mi alapján kéne emlékeznie arra.<br><br>Legalább egy "
 "szempontot meg kell adnod."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1832,174 +1766,159 @@ msgstr ""
 "tulajdonságai átszállnak a többi<br>ablakra is, és az emlékezõ beállítások "
 "is minden ablakra hatnak<br>majd, ami ugyanezekkel a tulajdonságokkal "
 "rendelkezik.<br>Ez csak egy figyelmeztetés, mivel általában ez nem egy jó "
-"ötlet.<br>Ha tényleg ezt akarod, nyomd meg az <hilight>Elfogadom</hilight> "
+"ötlet.<br>Ha tényleg ezt akarod, nyomd meg az <hilight>Alkalmaz</hilight> "
 "vagy <hilight>OK</hilight> gombok egyikét.<br>Ha nem ezt szeretnéd,nyomd meg "
 "a <hilight>Mégse</hilight> gombot, és semmi nem változik majd."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Semmi"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Méret és hely"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
-msgstr "Szabályok"
+msgstr "Zárolások"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
-msgstr "Méret, hely és szabályok"
+msgstr "Méret, hely és zárolások"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Minden"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Ezek alapján emlékezz:"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Az ablak neve és osztálya"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Ablak szerepe"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Ablak típusa"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Mulandóság"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
-msgstr "Tulajdonságok, amire emlékezz:"
+msgstr "Tulajdonságok, amire emlékezz"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
-msgstr ""
+msgstr "Ikon tulajdonságok"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Virtuális asztal"
 
-#: src/bin/e_int_border_remember.c:514
-#, fuzzy
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
-msgstr "Képernyõ zárolás"
+msgstr "Aktuális képernyő"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
-msgstr "Hagyd ki az ablaklistából"
+msgstr "Ablak lista kihagyása"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
-msgstr "Csak eny ablakkal egyezzen"
+msgstr "Csak egy ablakkal egyezzen"
 
-#: src/bin/e_int_border_remember.c:525
-#, fuzzy
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
-msgstr "Állítsd vissza a felbontást indításkor!"
+msgstr "Indítsd ezt a programot a bejelentkezéskor"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
-msgstr ""
+msgstr "Induláskor mindig figyeld"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Beállítás"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
-#, fuzzy
 msgid "File Manager"
-msgstr "Fájlkezelõ (Teszt!)"
+msgstr "Fájlkezelő"
 
-#: src/bin/e_int_config_modules.c:43
-#, fuzzy
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
-msgstr "Polc mérete"
+msgstr "Polc"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
-msgstr "Modulbeállítások"
+msgstr "Modul beállítások"
 
-#: src/bin/e_int_config_modules.c:167
-#, fuzzy
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
-msgstr "Elérhető elemek"
+msgstr "Elérhető modulok"
 
-#: src/bin/e_int_config_modules.c:174
-#, fuzzy
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
-msgstr "(Nincsenek betöltött modulok)"
+msgstr "Modul betöltése"
 
-#: src/bin/e_int_config_modules.c:181
-#, fuzzy
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
-msgstr "(Nincsenek betöltött modulok)"
+msgstr "Betöltött modulok"
 
-#: src/bin/e_int_config_modules.c:188
-#, fuzzy
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
-msgstr "Hiba a modul betöltésekor"
+msgstr "Modul kikapcsolása"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
-msgstr ""
+msgstr "Leírás: Nem elérhető"
 
 #: src/bin/e_int_gadcon_config.c:32
-#, fuzzy
 msgid "Shelf Contents"
-msgstr "Polc beállítása"
+msgstr "Polc elemei"
 
 #: src/bin/e_int_gadcon_config.c:38
-#, fuzzy
 msgid "Toolbar Contents"
-msgstr "Tartalom konfigurálása"
+msgstr "Eszköztár elemei"
 
 #: src/bin/e_int_gadcon_config.c:93
-#, fuzzy
 msgid "Available Gadgets"
-msgstr "Elérhető elemek"
+msgstr "Elérhető modulok"
 
 #: src/bin/e_int_gadcon_config.c:100
-#, fuzzy
 msgid "Add Gadget"
-msgstr "Kütyük"
+msgstr "Modul hozzáadása"
 
 #: src/bin/e_int_gadcon_config.c:106
-#, fuzzy
 msgid "Selected Gadgets"
-msgstr "Ikon-forrás"
+msgstr "Kiválasztott modulok"
 
 #: src/bin/e_int_gadcon_config.c:113
-#, fuzzy
 msgid "Remove Gadget"
-msgstr "Törlés"
+msgstr "Modul eltávolítása"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:328
-#, fuzzy
 msgid "Toolbar Configuration"
-msgstr "IBar tulajdonságok"
+msgstr "Eszköztár tulajdonságok"
 
 #: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:499
 #: src/bin/e_int_shelf_config.c:564
 msgid "Layout"
-msgstr "Kinézet"
+msgstr "Elrendezés"
 
 #: src/bin/e_intl.c:355
 msgid "Input Method Error"
@@ -2011,34 +1930,34 @@ msgid ""
 "input<br>method configuration is correct and<br>that your "
 "configuration's<br>executable is in your PATH<br>"
 msgstr ""
-"Hiba a beviteli mód indításánál<br><br>Kérlek ellenõrizd, hogy a "
-"beállítások<br>jók-e, és hogy a futtatható állomány<br>benne van-e a PATH "
-"változóban<br>"
+"Hiba indítás a(z) tagfüggvény futtatható<br><br> az ön<br> tagfüggvény "
+"beállítás jelenleg és<br> az ön beállítás s<br> futtatható jelenleg in az ön "
+"ÚTVONAL<br>"
 
 #: src/bin/e_int_menus.c:90
-#, fuzzy
 msgid "Main"
-msgstr "Sima"
+msgstr "FÅ‘"
 
 #: src/bin/e_int_menus.c:107
 msgid "Favorite Applications"
 msgstr "Kedvencek"
 
 #: src/bin/e_int_menus.c:118 src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Applications"
-msgstr "Alkalmazás"
+msgstr "Alkalmazások"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Ablakok"
 
 #: src/bin/e_int_menus.c:174
 msgid "About"
-msgstr "Adatok"
+msgstr "Névjegy"
 
 #: src/bin/e_int_menus.c:179 src/modules/conf_theme/e_mod_main.c:39
 #: src/modules/conf_theme/e_mod_main.c:84
@@ -2046,9 +1965,8 @@ msgid "Theme"
 msgstr "Téma"
 
 #: src/bin/e_int_menus.c:263
-#, fuzzy
 msgid "Virtual"
-msgstr "Virtuális asztal"
+msgstr "Virtuális"
 
 #: src/bin/e_int_menus.c:271 src/modules/conf_shelves/e_mod_main.c:39
 #: src/modules/conf_shelves/e_mod_main.c:84
@@ -2056,93 +1974,86 @@ msgid "Shelves"
 msgstr "Polcok"
 
 #: src/bin/e_int_menus.c:281
-#, fuzzy
 msgid "Show/Hide All Windows"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Összes ablak mutatása/elrejtése"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Nincs alkalmazás)"
 
-#: src/bin/e_int_menus.c:747
-#, fuzzy
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
-msgstr "Virtuális asztalok"
+msgstr "Virtuális asztalok beállítása"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
-msgstr "Képernyõ zárolása"
+msgstr "Képernyő zárolása"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
-msgstr ""
+msgstr "Hibernálás"
 
-#: src/bin/e_int_menus.c:888
-#, fuzzy
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
-msgstr "Kinézet"
+msgstr "Kijelentkezés"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Nincsenek ablakok)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Elveszett ablakok"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Nincs név!!!"
 
-#: src/bin/e_int_menus.c:1512
-#, fuzzy
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
-msgstr "Polcok"
+msgstr "(Nincsenek polcok)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
-#, fuzzy
 msgid "Shelf #"
-msgstr "Polc mérete"
+msgstr "Polc #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
-msgstr ""
+msgstr "Polc hozzáadása"
 
-#: src/bin/e_int_menus.c:1585
-#, fuzzy
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
-msgstr "Töröl"
+msgstr "Polc törlése"
 
 #: src/bin/e_int_shelf_config.c:71 src/bin/e_shelf.c:1639
 msgid "Shelf Configuration"
 msgstr "Polc beállítása"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
-msgstr ""
+msgstr "Apró"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
-msgstr ""
+msgstr "Kicsi"
 
 #: src/bin/e_int_shelf_config.c:521 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Közepes"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
-msgstr "Lapozó"
+msgstr "Nagy"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
-msgstr ""
+msgstr "nagyon nagy"
 
 #: src/bin/e_int_shelf_config.c:531 src/bin/e_int_shelf_config.c:636
 msgid "Configure Contents..."
@@ -2161,14 +2072,12 @@ msgid "Below Everything"
 msgstr "Minden alatt"
 
 #: src/bin/e_int_shelf_config.c:560
-#, fuzzy
 msgid "Allow windows to overlap the shelf"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Az ablakok eltakarhatják a polcot"
 
 #: src/bin/e_int_shelf_config.c:597
-#, fuzzy
 msgid "Shrink to Content Size"
-msgstr "Összehúzás"
+msgstr "Tartalom méretének összehúzása"
 
 #: src/bin/e_int_shelf_config.c:599
 msgid "Shelf Size"
@@ -2180,51 +2089,46 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Stílusok"
 
 #: src/bin/e_int_shelf_config.c:643
-#, fuzzy
 msgid "Auto Hide"
-msgstr "Automatikusan kiemelkedés"
+msgstr "Automatikus elrejtés"
 
 #: src/bin/e_int_shelf_config.c:644
 msgid "Auto-hide the shelf"
-msgstr ""
+msgstr "Polc automatikus elrejtése"
 
 #: src/bin/e_int_shelf_config.c:647
-#, fuzzy
 msgid "Show on mouse in"
-msgstr "Megjelenítés ezen a képernyõn:"
+msgstr "Mutasd ha az egér rajta van"
 
 #: src/bin/e_int_shelf_config.c:649
 msgid "Show on mouse click"
-msgstr ""
+msgstr "Mutasd egér kattintásra"
 
 #: src/bin/e_int_shelf_config.c:651
 msgid "Hide timeout"
-msgstr ""
+msgstr "Elrejtés ennyi idő után"
 
 #: src/bin/e_int_shelf_config.c:653 src/bin/e_int_shelf_config.c:657
-#, fuzzy, c-format
+#, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f másodperc"
 
 #: src/bin/e_int_shelf_config.c:655
-#, fuzzy
 msgid "Hide duration"
-msgstr "Nincs simítás"
+msgstr "Elrejtés időtartama"
 
 #: src/bin/e_int_shelf_config.c:663
-#, fuzzy
 msgid "Show on all Desktops"
-msgstr "Ez az asztal"
+msgstr "Mutasd minden asztalon"
 
 #: src/bin/e_int_shelf_config.c:665
-#, fuzzy
 msgid "Show on specified Desktops"
-msgstr "Ez az asztal"
+msgstr "Mutrasd a kiválasztott asztalon"
 
 #: src/bin/e_ipc.c:48
 #, c-format
@@ -2236,6 +2140,12 @@ msgid ""
 "or is not owned by you. Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"Lehetséges IPC Hack Kísérlet. Az IPC csatlakozás\n"
+"könyvtár már létezik, de a jogosultságai\n"
+"túlságosan különbözőek (csak atulajdonos\n"
+"olvashatja, írhatja, és senki más)\n"
+"de nem te vagy a tulajdonos. Kérlek ellenőrizd:\n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:62
 #, c-format
@@ -2245,6 +2155,10 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"Az IPC csatlakozási könyvtárt nem lehet létrehozni\n"
+"\n"
+"Kérlek ellenőrizd:\n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:250
 #, c-format
@@ -2271,8 +2185,8 @@ msgid ""
 "\t\tBe psychotic.\n"
 msgstr ""
 "Kapcsolók:\n"
-"\t-display DISPLAY\n"
-"\t\tCsatlakozás a DISPLAY X kiszolgálóhoz.\n"
+"\t-display MEGJELENÍTŐ\n"
+"\t\tCsatlakozás a xy nevű megjelenítőhöz.\n"
 "\t\tPl: -display :1.0\n"
 "\t-fake-xinerama-screen WxH+X+Y\n"
 "\t\tHamis xinerama képernyõket készít, a megadott méretben\n"
@@ -2295,7 +2209,7 @@ msgid ""
 "Enlightenment cannot Initialize Ecore!\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nemtudta elindítani az Ecore-t!\n"
+"Az E17 nem tudta elindítani az Ecore-t!\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:336
@@ -2303,7 +2217,7 @@ msgid ""
 "Enlightenment cannot initialize the File system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nemtudta betölteni a fájlrendszert!\n"
+"Az E17 nem tudta betölteni a fájlrendszert.\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:348
@@ -2311,7 +2225,7 @@ msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nem tudta betölteni a kilépési signál kezelõt!\n"
+"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:354
@@ -2319,7 +2233,7 @@ msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nem tudta betölteni a HUP szignál kezelõt!\n"
+"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:366
@@ -2327,7 +2241,7 @@ msgid ""
 "Enlightenment cannot initialize its X connection.\n"
 "Have you set your DISPLAY variable?"
 msgstr ""
-"Az e17 nem tudott csatlakozni az X szerverhez.\n"
+"Az E17 nem tudott csatlakozni az X szerverhez.\n"
 "Be van állítva a DISPLAY változó?"
 
 #: src/bin/e_main.c:374
@@ -2335,7 +2249,7 @@ 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"
+"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:397
@@ -2343,7 +2257,7 @@ 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"
+"Az E17 nem tudta elindítani a kapcsolódási rendszert!\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:405
@@ -2351,7 +2265,7 @@ 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"
+"Az E17 nem tudta elindítani az IPC rendszert!\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:414
@@ -2359,7 +2273,7 @@ msgid ""
 "Enlightenment cannot setup xinerama wrapping.\n"
 "This should not happen."
 msgstr ""
-"Az e17 nem tudta beállítani a xinerama keretrendszert!\n"
+"Az E17 nem tudta beállítani a xinerama keretrendszert!\n"
 "Ennek nem kéne megtörténnie"
 
 #: src/bin/e_main.c:436
@@ -2367,7 +2281,7 @@ 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"
+"Az E17 nem tudta elindítani az Evas-t!\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:442
@@ -2391,12 +2305,11 @@ msgstr ""
 "támogatják-e a fenti funkciót!"
 
 #: src/bin/e_main.c:465 src/bin/e_main.c:472
-#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nemtudta betölteni a fájlrendszert!\n"
+"Az E17 nem tudta betölteni a fájlrendszert!\n"
 "Talán kevés a memória?"
 
 #: src/bin/e_main.c:483
@@ -2404,50 +2317,48 @@ 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."
+"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:493
-#, fuzzy
 msgid "Enlightenment cannot set up its file registry system."
-msgstr "Az e17 nem tudta beállítani konfigurációs rendszert."
+msgstr "Az E17 nem tudta beállítani konfigurációs rendszert."
 
 #: src/bin/e_main.c:502
 msgid "Enlightenment cannot set up its config system."
-msgstr "Az e17 nem tudta beállítani konfigurációs rendszert."
+msgstr "Az E17 nem tudta beállítani konfigurációs rendszert."
 
 #: src/bin/e_main.c:510
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Az e17 nem tudta felállítani az intl rendszerét."
+msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
 #: src/bin/e_main.c:519
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Az e17 nem tudta felállítani a fájlok elérési útjait.\n"
+"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:537
 msgid "Enlightenment cannot set up its font system."
-msgstr "Az e17 nem tudta elindítani a betütípus-rendszert."
+msgstr "Az E17 nem tudta elindítani a betütípus-rendszert."
 
 #: src/bin/e_main.c:548
 msgid "Enlightenment cannot set up its theme system."
-msgstr "Az e17 nem tudta elindítani a témázó-rendszert."
+msgstr "Az E17 nem tudta elindítani a témázó-rendszert."
 
 #: src/bin/e_main.c:559
 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"
+"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:570
 msgid "Testing Format Support"
-msgstr ""
+msgstr "Formátum támogatás tesztelése"
 
 #: src/bin/e_main.c:580
 msgid ""
@@ -2483,45 +2394,41 @@ msgstr ""
 
 #: src/bin/e_main.c:621
 msgid "Starting International Support"
-msgstr ""
+msgstr "Nemzetközi támogatás indítása"
 
 #: src/bin/e_main.c:626
 msgid "Enlightenment cannot set up its intl system."
-msgstr "Az e17 nem tudta felállítani az intl rendszerét."
+msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
 #: src/bin/e_main.c:631
-#, fuzzy
 msgid "Setting up Paths"
-msgstr "Betûtípus beállítások"
+msgstr "Útvonalak beállítása"
 
 #: src/bin/e_main.c:648
 msgid "Setup Thumbnailer"
-msgstr ""
+msgstr "Előkép beállítása"
 
 #: src/bin/e_main.c:653
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr "Az e17 nem tudta elindítani a elõkép-generátort!\n"
+msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
 #: src/bin/e_main.c:658
 msgid "Setup System Controls"
-msgstr ""
+msgstr "Vezérlőpult beállítása"
 
 #: src/bin/e_main.c:663
-#, fuzzy
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr "Az e17 nem tudta elindítani a elõkép-generátort!\n"
+msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
 #: src/bin/e_main.c:668
-#, fuzzy
 msgid "Setup Actions"
-msgstr "Kedvencek"
+msgstr "Folyamatok beállítása"
 
 #: src/bin/e_main.c:673
 msgid "Enlightenment cannot set up its actions system."
-msgstr "Az e17 nem tudta elindítani az akció-rendszerét."
+msgstr "Az E17 nem tudta elindítani az akció-rendszerét."
 
 #: src/bin/e_main.c:677
-#, fuzzy
 msgid "Setup Bindings"
 msgstr "Billentyûkombinációk"
 
@@ -2530,184 +2437,164 @@ 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:686
-#, fuzzy
 msgid "Setup Popups"
-msgstr "Felbukkanó ablak megjelenítése"
+msgstr "felugró ablakok beállítása"
 
 #: src/bin/e_main.c:691
 msgid "Enlightenment cannot set up its popup system."
-msgstr "Az e17 nem tudta felállítani a felugró-ablak rendszert."
+msgstr "Az E17 nem tudta beállítani a felugró-ablak rendszert."
 
 #: src/bin/e_main.c:696
-#, fuzzy
 msgid "Setup Wallpaper"
-msgstr "Asztalváltás egérrel"
+msgstr "Háttérkép beállítása"
 
 #: src/bin/e_main.c:701
-#, fuzzy
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr "Az e17 nem tudta felállítani az asztalzár-rendszert."
+msgstr "Az E17 nem tudta beállítani az asztal háttér-rendszert."
 
 #: src/bin/e_main.c:705
-#, fuzzy
 msgid "Setup Screens"
-msgstr "Képernyõ zárolás"
+msgstr "képernyők beállítása"
 
 #: src/bin/e_main.c:710
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Az e17 nem tudta elindítan az ablakkezelést. Lehet, hogy fut már egy másik\n"
+"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:715
 msgid "Setup Execution System"
-msgstr ""
+msgstr "Végrehajtó rendszer beállítása"
 
 #: src/bin/e_main.c:720
-#, fuzzy
 msgid "Enlightenment cannot set up its exec system."
-msgstr "Az e17 nem tudta elindítani a exebuf rendszert."
+msgstr "Az E17 nem tudta elindítani a exec rendszert."
 
 #: src/bin/e_main.c:724
-#, fuzzy
 msgid "Setup Remembers"
-msgstr "Emlékezés"
+msgstr "Emlékezések beállítása"
 
 #: src/bin/e_main.c:729
 msgid "Enlightenment cannot setup remember settings."
-msgstr "Az e17 nem tudta felállítani az emlékezési beállításokat."
+msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
 
 #: src/bin/e_main.c:737
 msgid "Setup FM"
-msgstr ""
+msgstr "FM beállítása"
 
 #: src/bin/e_main.c:742
 msgid "Enlightenment cannot initialize the File manager.\n"
-msgstr "Az e17 nem tudta elindítani a fájlkezelõt!\n"
+msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
 #: src/bin/e_main.c:755
 msgid "Setup Message System"
-msgstr ""
+msgstr "Üzenet rendszer beállítása"
 
 #: src/bin/e_main.c:760
 msgid "Enlightenment cannot set up its msg system."
-msgstr "Az e17 nem tudta felállítani az üzenet-rendszert."
+msgstr "Az E17 nem tudta felállítani az üzenet-rendszert."
 
 #: src/bin/e_main.c:764
 msgid "Setup DND"
-msgstr ""
+msgstr "FÉV beállítása"
 
 #: src/bin/e_main.c:769
 msgid "Enlightenment cannot set up its dnd system."
-msgstr "Az e17 nem tudta felállítani a fogd-és-vidd rendszert."
+msgstr "Az E17 nem tudta felállítani a fogd-és-vidd rendszert."
 
 #: src/bin/e_main.c:773
 msgid "Setup Grab Input HAnding"
-msgstr ""
+msgstr "Bejövő mozdulat kezelő beállítása"
 
 #: src/bin/e_main.c:778
 msgid "Enlightenment cannot set up its input grab handling system."
-msgstr "Az e17 nem tudta elindítani a bejövõ mozdulat-kezelõt."
+msgstr "Az E17 nem tudta elindítani a bejövõ mozdulat-kezelõt."
 
 #: src/bin/e_main.c:782
-#, fuzzy
 msgid "Setup Modules"
-msgstr "Modulok"
+msgstr "Modulok beállítása"
 
 #: src/bin/e_main.c:787
 msgid "Enlightenment cannot set up its module system."
-msgstr "Az e17 nem tudta elindítani a modul rendszert."
+msgstr "Az E17 nem tudta elindítani a modul rendszert."
 
 #: src/bin/e_main.c:791
-#, fuzzy
 msgid "Setup Color Classes"
-msgstr "Ikon osztály"
+msgstr "szín osztályok beállítása"
 
 #: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its color class system."
-msgstr "Az e17 nem tudta elindítani a szín-osztály rendszert."
+msgstr "Az E17 nem tudta elindítani a szín-osztály rendszert."
 
 #: src/bin/e_main.c:800
-#, fuzzy
 msgid "Setup Gadcon"
-msgstr "Parancs futtatása"
+msgstr "Modulkezelő beállítása"
 
 #: src/bin/e_main.c:805
 msgid "Enlightenment cannot set up its gadget control system."
-msgstr "Az e17 kütyü-kezelõt."
+msgstr "Az E17 nem tudta elindítani a modul kezelõ rendszert."
 
 #: src/bin/e_main.c:809
-#, fuzzy
 msgid "Setup Shelves"
-msgstr "Polcok"
+msgstr "Polcok beállítása"
 
 #: src/bin/e_main.c:814
 msgid "Enlightenment cannot set up its shelf system."
-msgstr "Az e17 nem tudta elindítani a polc-rendszert."
+msgstr "Az E17 nem tudta elindítani a polc-rendszert."
 
 #: src/bin/e_main.c:819
 msgid "Setup DPMS"
-msgstr ""
+msgstr "DPMS Beállítás"
 
 #: src/bin/e_main.c:824
-#, fuzzy
 msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Az e17 nem tudta felállítani az emlékezési beállításokat."
+msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
 
 #: src/bin/e_main.c:828
-#, fuzzy
 msgid "Setup Screensaver"
-msgstr "Képernyõterület"
+msgstr "Képernyőkímélő beállítása"
 
 #: src/bin/e_main.c:833
-#, fuzzy
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr "Az e17 nem tudta elindítani a fájlkezelõt!\n"
+msgstr "Az E17 nem tudta elindítani az X képernyővédőt!"
 
 #: src/bin/e_main.c:837
-#, fuzzy
 msgid "Setup Mouse"
-msgstr "Töröl"
+msgstr "Egér beállítása"
 
 #: src/bin/e_main.c:842
-#, fuzzy
 msgid "Enlightenment cannot configure the mouse acceleration settings."
-msgstr "Az e17 nem tudta felállítani az emlékezési beállításokat."
+msgstr "Az E17 nem tudta beállítani az egér beállításokat"
 
 #: src/bin/e_main.c:846
-#, fuzzy
 msgid "Setup Desklock"
-msgstr "Küldd erre az asztalra"
+msgstr "Asztal zárolás beállítása"
 
 #: src/bin/e_main.c:851
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr "Az e17 nem tudta felállítani az asztalzár-rendszert."
+msgstr "Az E17 nem tudta felállítani az asztalzár-rendszert."
 
 #: src/bin/e_main.c:856
 msgid "Set Up File Ordering"
-msgstr ""
+msgstr "Fájl utasítás beállítása"
 
 #: src/bin/e_main.c:860
-#, fuzzy
 msgid "Enlightenment cannot set up its order file system."
-msgstr "Az e17 nem tudta elindítani a modul rendszert."
+msgstr "Az E17 nem tudta elindítani a fájl utasítás rendszert."
 
 #: src/bin/e_main.c:865
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "CPU energia-szabály létrehozása"
+msgstr "Energiatakarékosság beállítása"
 
 #: src/bin/e_main.c:869
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Az e17 nem tudta felállítani a felugró-ablak rendszert."
+msgstr "Az e17 nem tudta felállítani az energiatakarékossági rendszert."
 
 #: src/bin/e_main.c:901
-#, fuzzy
 msgid "Load Modules"
-msgstr "(Nincsenek betöltött modulok)"
+msgstr "Modulok betöltése"
 
 #: src/bin/e_main.c:909
 msgid ""
@@ -2716,10 +2603,14 @@ msgid ""
 "problem<br>modules from your configuration. The module<br>configuration "
 "dialog should let you select your<br>modules again."
 msgstr ""
+"Az E17 sérült már az indítás elején, ezért<br>újra lett indítva. Minden "
+"modul le van tiltva<br>és addig nem is lesznek elindítva, amíg el nem "
+"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:916
 msgid "Enlightenment crashed early on start and has been restarted"
-msgstr ""
+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:917
 msgid ""
@@ -2728,29 +2619,33 @@ msgid ""
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
+"Az E17 sérült már az indítás elején, ezért<br>újra lett indítva. Minden "
+"modul le van tiltva<br>és addig nem is lesznek elindítva, amíg el nem "
+"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:925
-#, fuzzy
 msgid "Configure Shelves"
-msgstr "Beállított polcok"
+msgstr "Polcok beállítása"
 
 #: src/bin/e_main.c:932
 msgid "Almost Done"
-msgstr ""
+msgstr "Madnem kész"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, 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 ""
-"Hiba a %s modul betöltésekor<br>Nincs %s nevû modul a modulkönyvtárakban."
+"Hiba a %s modul betöltésekor<br>Nincs %s nevû modul a modul könyvtárakban."
+"<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Hiba a modul betöltésekor"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2759,11 +2654,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
-msgstr "A modul nem tartalmazza az összes szükséges függvényt"
+msgstr "A modul nem tartalmazza az összes szükséges funkciót"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2771,67 +2666,59 @@ msgid ""
 "%i.<br>"
 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>"
+"legalább %i verziójú api kell<br>Az Enlightenment API verziója: %i<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
-msgstr "Szeretnéd a modult kiüríteni a memóriából?<br>"
+msgstr "Szeretnéd a modult kikapcsolni?<br>"
 
 #: src/bin/e_shelf.c:1178 src/modules/conf_shelves/e_int_config_shelf.c:281
-#, fuzzy
 msgid "Are you sure you want to delete this shelf?"
-msgstr "Biztosan törölni akarod a <br><b>%s</b> nevû fájlt?"
+msgstr "Biztosan törölni akarod ezt a polcot?"
 
 #: src/bin/e_shelf.c:1179
-#, fuzzy
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
-msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+msgstr "A polc törlését választottad.<br><br>Biztosan törölni akarod?"
 
 #: src/bin/e_shelf.c:1629 src/bin/e_toolbar.c:318
-#, fuzzy
 msgid "Stop Moving/Resizing Items"
-msgstr "Elemek szerkesztésének vége"
+msgstr "Elemek mozgatásának/átméretezésének leállítása"
 
 #: src/bin/e_shelf.c:1631 src/bin/e_toolbar.c:320
-#, fuzzy
 msgid "Begin Moving/Resizing Items"
-msgstr "Elemek szerkesztése"
+msgstr "Elemek mozgatása/átméretezése"
 
 #: src/bin/e_shelf.c:1644
-#, fuzzy
 msgid "Configure Shelf Contents"
 msgstr "Tartalom konfigurálása"
 
 #: src/bin/e_shelf.c:1649
 msgid "Delete this Shelf"
-msgstr ""
+msgstr "Polc törlése"
 
 #: src/bin/e_startup.c:62
-#, fuzzy
 msgid "Starting"
-msgstr "%s indítása"
+msgstr "Indulás folyamatban"
 
 #: src/bin/e_sys.c:128
 msgid "Checking System Permissions"
-msgstr ""
+msgstr "Rendszer jogosultságok ellenőrzése"
 
 #: src/bin/e_sys.c:165 src/bin/e_sys.c:176 src/bin/e_sys.c:185
 #: src/bin/e_sys.c:194
 msgid "System Check Done"
-msgstr ""
+msgstr "Rendszer ellenőrzés kész"
 
 #: src/bin/e_sys.c:271
 msgid "Logout problems"
-msgstr ""
+msgstr "Kijelentkezési problémák"
 
 #: src/bin/e_sys.c:274
 msgid ""
@@ -2839,136 +2726,140 @@ msgid ""
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 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:280
-#, fuzzy
 msgid "Logout now"
-msgstr "Elveszett ablakok"
+msgstr "Kijelentkezés most"
 
 #: src/bin/e_sys.c:281
 msgid "Wait longer"
-msgstr ""
+msgstr "Várakozás"
 
 #: src/bin/e_sys.c:282
-#, fuzzy
 msgid "Cancel Logout"
-msgstr "Mégse"
+msgstr "Mégsem lép ki"
 
 #: src/bin/e_sys.c:320
 msgid "Logout in progress"
-msgstr ""
+msgstr "Kijelentkezés folyamatban"
 
 #: src/bin/e_sys.c:323
 msgid "Logout is currently in progress.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "A kijelentkezés folyamatban van.<br><hilight>Kérlek várj.</hilight>"
 
 #: src/bin/e_sys.c:352 src/bin/e_sys.c:412
-#, fuzzy
 msgid "Enlightenment is busy with another request"
-msgstr "Az e17 nem tudta elindítani a témázó-rendszert."
+msgstr "Az E17 foglalt egy másik kérés által"
 
 #: src/bin/e_sys.c:358
 msgid ""
 "Enlightenment is busy logging out.<br>You cannot perform other system "
 "actions<br>once a logout has begun."
 msgstr ""
+"Az E17 épp kijelentkezéshez készül.<br>Nem indíthatsz másik rendszer "
+"folyamatot, <br>ha a kijelentkezés elkezdődött."
 
 #: src/bin/e_sys.c:365
 msgid ""
 "Enlightenment is shutting the system down.<br>You cannot do any other system "
 "actions<br>once a shutdown has been started."
 msgstr ""
+"Az E17 épp a rendszer kikapcsolásához készül.<br>Nem indíthatsz másik "
+"rendszer folyamatot, <br>ha a kikapcsolás elkezdődött."
 
 #: src/bin/e_sys.c:372
 msgid ""
 "Enlightenment is rebooting the system.<br>You cannot do any other system "
 "actions<br>once a reboot has begun."
 msgstr ""
+"Az E17 épp újraindítja a rendszert.<br>Nem indíthatsz másik rendszer "
+"folyamatot, <br>ha az újraindítás elkezdődött."
 
 #: src/bin/e_sys.c:379
 msgid ""
 "Enlightenment is suspending the system.<br>Until suspend is complete you "
 "cannot perform<br>any other system actions."
 msgstr ""
+"Az E17 épp a rendszer felfüggesztésére készül.<br>Nem indíthatsz másik "
+"rendszer folyamatot, <br>ha a felfüggesztés elkezdődött."
 
 #: src/bin/e_sys.c:386
 msgid ""
 "Enlightenment is hibernating the system.<br>You cannot perform an other "
 "system actions<br>until this is complete."
 msgstr ""
+"Az E17 épp a rendszer hibernálásához készül.<br>Nem indíthatsz másik "
+"rendszer folyamatot, <br>ha a hibernálás elkezdődött."
 
 #: src/bin/e_sys.c:393 src/bin/e_sys.c:438
 msgid "EEK! This should not happen"
-msgstr ""
+msgstr "EEK! Ez nem történhet meg"
 
 #: src/bin/e_sys.c:418
 msgid "Shutting down of your system failed."
-msgstr ""
+msgstr "A számítógép kikapcsolása nem sikerült."
 
 #: src/bin/e_sys.c:423
 msgid "Rebooting your system failed."
-msgstr ""
+msgstr "A számítógép újraindítása nem sikerült."
 
 #: src/bin/e_sys.c:428
 msgid "Suspend of your system failed."
-msgstr ""
+msgstr "A rendszer felfüggesztése nem sikerült."
 
 #: src/bin/e_sys.c:433
 msgid "Hibernating your system failed."
-msgstr ""
+msgstr "A rendszer hibernálása nem sikerült."
 
 #: src/bin/e_sys.c:483
 msgid "Shutting down"
-msgstr ""
+msgstr "Kikapcsolás"
 
 #: src/bin/e_sys.c:486
 msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "A számítógép kikapcsolása.<br><hilight>Kérlek várj.</hilight>"
 
 #: src/bin/e_sys.c:510
-#, fuzzy
 msgid "Rebooting"
-msgstr "Felbontás"
+msgstr "Újraindítás"
 
 #: src/bin/e_sys.c:513
 msgid "Rebooting your Computer.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "A számítógép újraindítása.<br><hilight>Kérlek várj.</hilight>"
 
 #: src/bin/e_sys.c:536
-#, fuzzy
 msgid "Suspending"
-msgstr "Szerkesztés vége"
+msgstr "Felfüggesztés"
 
 #: src/bin/e_sys.c:539
 msgid "Suspending your Computer.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "A rendszer felfüggesztése.<br><hilight>Kérlek várj.</hilight>"
 
 #: src/bin/e_sys.c:562
-#, fuzzy
 msgid "Hibernating"
-msgstr "Nincs simítás"
+msgstr "Hibernálás"
 
 #: src/bin/e_sys.c:565
 msgid "Hibernating your Computer.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "A rendszer hibernálása.<br><hilight>Kérlek várj.</hilight>"
 
 #: src/bin/e_theme_about.c:66
 msgid "About This Theme"
-msgstr "Errõl a témáról"
+msgstr "A témáról"
 
 #: src/bin/e_theme.c:41
-#, fuzzy
 msgid "Set As Theme"
-msgstr "Errõl a témáról"
+msgstr "Beállítás témának"
 
 #: src/bin/e_toolbar.c:333
-#, fuzzy
 msgid "Configure Toolbar Contents"
-msgstr "Tartalom konfigurálása"
+msgstr "Eszköztár tartalom beállítása"
 
 #: src/bin/e_utils.c:282
 msgid "Cannot exit - immortal windows."
-msgstr "Nemtudok kilépni - halhatatlan ablakok"
+msgstr "Nem tudok kilépni - halhatatlan ablakok"
 
 #: src/bin/e_utils.c:283
 msgid ""
@@ -2981,64 +2872,64 @@ msgstr ""
 "vannak<br>vagy az Élettartam zár el nem lett távolítva<br>"
 
 #: src/bin/e_utils.c:738
-#, fuzzy, c-format
+#, c-format
 msgid "%'.0f Bytes"
-msgstr "%1.0f perc"
+msgstr "%'.0f Bájt"
 
 #: src/bin/e_utils.c:742
-#, fuzzy, c-format
+#, c-format
 msgid "%'.0f KB"
-msgstr "%1.0f MB"
+msgstr "%'.0f KB"
 
 #: src/bin/e_utils.c:746
-#, fuzzy, c-format
+#, c-format
 msgid "%'.0f MB"
-msgstr "%1.0f MB"
+msgstr "%'.0f MB"
 
 #: src/bin/e_utils.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "%'.1f GB"
-msgstr "%1.0f MB"
+msgstr "%'.1f GB"
 
 #: src/bin/e_utils.c:770
 #, c-format
 msgid "In the Future"
-msgstr ""
+msgstr "A jövőben"
 
 #: src/bin/e_utils.c:775
 #, c-format
 msgid "In the last Minute"
-msgstr ""
+msgstr "Az utolsó percben"
 
 #: src/bin/e_utils.c:777
 #, c-format
 msgid "%li Years ago"
-msgstr ""
+msgstr "%li éve"
 
 #: src/bin/e_utils.c:779
 #, c-format
 msgid "%li Months ago"
-msgstr ""
+msgstr "%li hónapja"
 
 #: src/bin/e_utils.c:781
 #, c-format
 msgid "%li Weeks ago"
-msgstr ""
+msgstr "%li hete"
 
 #: src/bin/e_utils.c:783
 #, c-format
 msgid "%li Days ago"
-msgstr ""
+msgstr "%li napja"
 
 #: src/bin/e_utils.c:785
 #, c-format
 msgid "%li Hours ago"
-msgstr ""
+msgstr "%li órája"
 
 #: src/bin/e_utils.c:787
 #, c-format
 msgid "%li Minutes ago"
-msgstr ""
+msgstr "%li perce"
 
 #: src/bin/e_utils.c:793
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1146
@@ -3055,102 +2946,98 @@ msgstr "Hozzáadás"
 
 #: src/bin/e_widget_config_list.c:59
 msgid "Remove"
-msgstr "Törlés"
+msgstr "Eltávolítás"
 
 #: src/bin/e_widget_config_list.c:73
 #: src/modules/conf_applications/e_int_config_apps.c:260
 msgid "Up"
-msgstr ""
+msgstr "Fel"
 
 #: src/bin/e_widget_config_list.c:79
 #: src/modules/conf_applications/e_int_config_apps.c:265
-#, fuzzy
 msgid "Down"
 msgstr "Le"
 
 #: src/bin/e_widget_fsel.c:288
-#, fuzzy
 msgid "Add to Favorites"
-msgstr "Kedvencek menü megjelenítése"
+msgstr "Hozzáadás a Kedvencekhez"
 
 #: src/bin/e_widget_fsel.c:294
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
-msgstr "Könyvtár"
+msgstr "Egy könyvtárt fel"
 
 #: src/bin/e_widget_fsel.c:355
 msgid "Permissions:"
-msgstr "Jogok:"
+msgstr "Jogosultságok:"
 
 #: src/bin/e_widget_fsel.c:371
-#, fuzzy
 msgid "Modified:"
-msgstr "Utoljára módosítva:"
+msgstr "Módosítva:"
 
 #: src/bin/e_widget_fsel.c:610
 #, c-format
 msgid "You"
-msgstr ""
+msgstr "Te"
 
 #: src/bin/e_widget_fsel.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "Protected"
-msgstr "Tulajdonságok"
+msgstr "Védett"
 
 #: src/bin/e_widget_fsel.c:661 src/bin/e_widget_fsel.c:670
 #: src/bin/e_widget_fsel.c:679
-#, fuzzy, c-format
+#, c-format
 msgid "Read Only"
-msgstr "Csak a nevet"
+msgstr "Csak olvasható"
 
 #: src/bin/e_widget_fsel.c:668 src/bin/e_widget_fsel.c:677
 #, c-format
 msgid "Forbidden"
-msgstr ""
+msgstr "Tiltott"
 
 #: src/bin/e_widget_fsel.c:686
 msgid "Read-Write"
-msgstr ""
+msgstr "Olvasás-Írás"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
-msgstr "Teleptöltöttség mérõ beállítások"
+msgstr "Telep töltöttség mérõ beállítások"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
-msgstr "Alap beállítások"
+msgstr "Alapbeállítások"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
-msgstr "Jelenjen meg figyelmeztetés, ha a teleptöltöttség alacsony"
+msgstr "Figyelmeztetés, ha a telep töltöttség alacsony"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
-msgstr "Haladó beállítások"
+msgstr "Speciális beállítások"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Telep állapotának ellenõrzése minden:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
-#, fuzzy, c-format
+#: src/modules/temperature/e_mod_config.c:380
+#, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fájl"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Figyelmeztessen, ha a telep csak eddig bírja:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3161,74 +3048,53 @@ msgstr "Figyelmeztessen, ha a telep csak eddig bírja:"
 msgid "%1.0f minutes"
 msgstr "%1.0f perc"
 
-#: src/modules/battery/e_mod_config.c:132
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:148
+#, c-format
 msgid "%1.0f percent"
-msgstr "%1.0f mp"
-
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Akkumulátor"
+msgstr "%1.0f százalék"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
-"Az akkumulátor kezd lemerülni<br>Esetleg csatlakoztathatnád egy "
-"áramforráshoz."
 
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "ROSSZ MEGHAJTó"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "Tele!!!"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Magas"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f másodperc"
 
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Alacsony"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Akkumulátor"
 
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Veszélyes!!!"
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Akkumulátor mérő"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Töltés"
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr "HIBA"
 
-#: src/modules/battery/e_mod_main.c:1456
-#, fuzzy
-msgid "Battery Meter"
-msgstr "Akkumulátor"
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr "N/A"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Óra"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Az Enlightenment beállítása"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
-msgstr ""
+msgstr "Elemek"
 
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/conf/e_mod_main.c:116
@@ -3237,56 +3103,48 @@ msgstr "Konfigurációs panel"
 
 #: src/modules/conf_applications/e_int_config_apps.c:51
 #: src/modules/conf_applications/e_mod_main.c:42
-#, fuzzy
 msgid "Favorites Menu"
-msgstr "Kedvencek menü megjelenítése"
+msgstr "Kedvencek menü"
 
 #: src/modules/conf_applications/e_int_config_apps.c:106
 #: src/modules/conf_applications/e_int_config_apps.c:121
 #: src/modules/conf_applications/e_mod_main.c:36
-#, fuzzy
 msgid "IBar Applications"
-msgstr "Alkalmazás"
+msgstr "Bar alkalmazások"
 
 #: src/modules/conf_applications/e_int_config_apps.c:138
 #: src/modules/conf_applications/e_mod_main.c:38
-#, fuzzy
 msgid "Startup Applications"
-msgstr "Kedvencek"
+msgstr "Automatikusan induló programok"
 
 #: src/modules/conf_applications/e_int_config_apps.c:155
 #: src/modules/conf_applications/e_mod_main.c:37
-#, fuzzy
 msgid "Restart Applications"
-msgstr "Kedvencek"
+msgstr "Alkalmazások újraindítása"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
-msgstr "Alkalmazás"
+msgstr "Alkalmazások"
 
 #: src/modules/conf_applications/e_int_config_apps.c:252
-#, fuzzy
 msgid "Selected Applications"
-msgstr "Alkalmazás"
+msgstr "Kiválasztott alkalmazások"
 
 #: src/modules/conf_applications/e_mod_main.c:35
-#, fuzzy
 msgid "New Application"
-msgstr "Alkalmazás"
+msgstr "Új program"
 
 #: src/modules/conf_applications/e_mod_main.c:39
 #: src/modules/conf_borders/e_mod_main.c:36
 #: src/modules/conf_desk/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:30
-#, fuzzy
 msgid "Internal"
-msgstr "Alatta"
+msgstr "Belső"
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
-msgstr ""
+msgstr "IBar egyéb"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
@@ -3296,9 +3154,8 @@ msgstr "Menük"
 
 #: src/modules/conf_borders/e_int_config_borders.c:29
 #: src/modules/conf_borders/e_int_config_borders.c:185
-#, fuzzy
 msgid "Default Border Style"
-msgstr "Keret stílus"
+msgstr "Alapértelmezett keret stílus"
 
 #: src/modules/conf_borders/e_int_config_borders.c:49
 msgid "Window Border Selection"
@@ -3306,26 +3163,24 @@ msgstr "Ablakkeret választása"
 
 #: src/modules/conf_borders/e_int_config_borders.c:230
 msgid "Remember this Border for this window next time it appears"
-msgstr "Ha az ablak újra megjelenik, emlékezz majd a keretére"
+msgstr "Megjegyez Szegély for ablak következő idő"
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
-msgstr "Keretek"
+msgstr "Szegélyek"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
-#, fuzzy
 msgid "Client List Settings"
 msgstr "Az ablaklista beállításai"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
-#, fuzzy
 msgid "Group By"
-msgstr "Csoport:"
+msgstr "Csoportosítás"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3334,296 +3189,270 @@ msgid "None"
 msgstr "Nincs"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:107
-#, fuzzy
 msgid "Include windows from other screens"
 msgstr "Minden ablak, minden képernyõrõl"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:111
 msgid "Separate Groups By"
-msgstr ""
+msgstr "Csoportok elválasztása"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:116
 msgid "Using separator bars"
-msgstr ""
+msgstr "Elválasztó bar-ok használata"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:118
 msgid "Using menus"
-msgstr ""
+msgstr "Menük használata"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:122
 msgid "Client Sort Order"
-msgstr ""
+msgstr "Kliens rendezés"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
 msgid "Alphabetical"
-msgstr ""
+msgstr "Ábécérend"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
-#, fuzzy
 msgid "Window stacking layer"
-msgstr "Ablak neve"
+msgstr "Ablak cimke réteg"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
-msgstr ""
+msgstr "Legtöbbet használt"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:134
-#, fuzzy
 msgid "Iconified Windows"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Ikonizált ablakok"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
-msgstr ""
+msgstr "Csoport asztallal"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:138
 msgid "Group with current desktop"
-msgstr ""
+msgstr "Csoport a jelenlegi munkaasztallal"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:140
 msgid "Separate group"
-msgstr ""
+msgstr "Csoprt elválasztása"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:142
 msgid "Warp to owning desktop"
-msgstr ""
+msgstr "Görbítés a munkaasztalra"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
-#, fuzzy
 msgid "Menu Item Captions"
-msgstr "Menü"
+msgstr "Menü elem feliratok"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
-msgstr ""
+msgstr "Felirat hosszának korlátozása"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f Chars"
-msgstr "%1.0f C"
+msgstr "%1.0f Karakter"
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
-#, fuzzy
 msgid "Client List Menu"
-msgstr "Ablakok menü megjelenítése"
+msgstr "Kliens lista menü"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:44
-#, fuzzy
 msgid "Window Manager"
-msgstr "Ablak neve"
+msgstr "Ablakkezelő"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:45
 msgid "About Dialog Title"
-msgstr ""
+msgstr "Névjegy Párbeszédablak Cím"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:46
 msgid "About Dialog Version"
-msgstr ""
+msgstr "Párbeszédablak verzió"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
-#, fuzzy
 msgid "Border Title"
 msgstr "Keret stílus"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
-#, fuzzy
 msgid "Configure Dialog Title"
-msgstr "Konfigurációs ablakok"
+msgstr "Párbeszéd cím beállítás"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
-#, fuzzy
 msgid "Error Text"
-msgstr "Hiba"
+msgstr "Hiba szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
-msgstr "Cím"
+msgstr "Menü cím"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Menü cím aktív"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
-msgstr "Menü"
+msgstr "Menüelem"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 msgid "Menu Item Active"
-msgstr ""
+msgstr "Menü elem aktív"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
-msgstr "Fel"
+msgstr "Szöveg mozgatása"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
-msgstr ""
+msgstr "Szöveg átméretezése"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
-#, fuzzy
 msgid "Winlist Item"
-msgstr "Ablaklista"
+msgstr "Ablaklista elem"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 msgid "Winlist Label"
-msgstr ""
+msgstr "Ablaklista címke"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
-msgstr "Ablak címe"
+msgstr "Ablaklista cím"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
-msgstr "Kütyük"
+msgstr "Felületi elemek"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:65
-#, fuzzy
 msgid "Button Text"
-msgstr "Alul-baloldalt"
+msgstr "nyomógombszöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:66
 msgid "Button Text Disabled"
-msgstr ""
+msgstr "Gomb szöveg tiltva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 msgid "Check Text"
-msgstr ""
+msgstr "Szöveg ellenőrzése"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
 msgid "Check Text Disabled"
-msgstr ""
+msgstr "Szöveg ellenőrzés tiltva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:69
 msgid "Entry Text"
-msgstr ""
+msgstr "Szöveg bevitel"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
 msgid "Label Text"
-msgstr ""
+msgstr "Címke szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
 msgid "List Item Text"
-msgstr ""
+msgstr "Lista elem szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
 msgid "List Item Odd Text"
-msgstr ""
+msgstr "Lista elem páratlan szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
-msgstr ""
+msgstr "Lista fejléc"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
 msgid "Radio Text"
-msgstr ""
+msgstr "Rádió szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "Rádió szöveg tiltva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:76
 msgid "Slider Text"
-msgstr ""
+msgstr "Csúszka szöveg"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "Csúszka szöveg tiltva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:84
-#, fuzzy
 msgid "Module Label"
-msgstr "Modul állapot"
+msgstr "Modul címke"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:124
 #: src/modules/conf_colors/e_mod_main.c:35
-#, fuzzy
 msgid "Colors"
-msgstr "Bezárás"
+msgstr "Színek"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:348
-#, fuzzy
 msgid "Window Manager Colors"
-msgstr "Az ablak neve és osztálya"
+msgstr "Ablak kezelő színek"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:350
 #: src/modules/conf_colors/e_int_config_color_classes.c:358
 #: src/modules/conf_colors/e_int_config_color_classes.c:366
 #: src/modules/conf_colors/e_int_config_color_classes.c:430
 msgid "Enabled"
-msgstr "Engedélyezett"
+msgstr "Engedélyezve"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:352
 #: src/modules/conf_colors/e_int_config_color_classes.c:360
 #: src/modules/conf_colors/e_int_config_color_classes.c:368
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Disabled"
-msgstr "Nem engedélyezett"
+msgstr "Tiltva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:356
 msgid "Widget Colors"
-msgstr ""
+msgstr "A grafikus elemek színei"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:364
-#, fuzzy
 msgid "Module Colors"
-msgstr "Modulok"
+msgstr "Modul színek"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:414
-#, fuzzy
 msgid "Color Classes"
-msgstr "Ikon osztály"
+msgstr "Ikon osztályok"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:442
 msgid "Object Color"
-msgstr ""
+msgstr "Objektum szín"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:451
 msgid "Outline Color"
-msgstr ""
+msgstr "Körvonal Szín"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:460
-#, fuzzy
 msgid "Shadow Color"
-msgstr "Követõ megjelenítése"
+msgstr "Árnyék szín"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:469
-#, fuzzy
 msgid "Defaults"
-msgstr "Alapértelmezett asztal"
+msgstr "Alapértelmezések"
 
 #: src/modules/conf_desk/e_int_config_desk.c:52
-#, fuzzy
 msgid "Desk Settings"
-msgstr "Az asztal beállításai"
+msgstr "Asztal beállításai"
 
 #: src/modules/conf_desk/e_int_config_desk.c:149
-#, fuzzy
 msgid "Desktop Name"
-msgstr "Asztal"
+msgstr "Asztal név"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
-msgstr "Név szerint"
+msgstr "Név:"
 
 #: src/modules/conf_desk/e_int_config_desk.c:156
-#, fuzzy
 msgid "Desktop Wallpaper"
-msgstr "Asztalváltás egérrel"
+msgstr "Munkaasztal háttérképe"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:203
@@ -3633,45 +3462,42 @@ msgid "Configure"
 msgstr "Beállítás"
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
 msgstr "Asztal"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:71
-#, fuzzy
 msgid "Screen Lock Settings"
-msgstr "Görgetési beállítások"
+msgstr "Képernyő zárolási beállítások"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:143
 msgid "Automatic Locking"
 msgstr "Automatikus zárolás"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:145
-#, fuzzy
 msgid "Lock when X screensaver activates"
 msgstr "Zárolás a képernyõvédõ indításakor"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:149
 msgid "Lock when idle time exceeded"
-msgstr ""
+msgstr "Zárolás ha meghaladja az inaktív időt"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:153
 msgid "Idle time to exceed"
-msgstr ""
+msgstr "Inaktív idő meghaladás"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
-msgstr "Egyéni"
+msgstr "Személyes"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:281
 msgid "Login Box Settings"
-msgstr "Bejelentkezési doboz beállításai"
+msgstr "Bejelentkező ablak beállításai"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:284
 msgid "Show on all screen zones"
@@ -3683,7 +3509,7 @@ msgstr "Megjelenítés a jelenlegi képernyõn"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:292
 msgid "Show on screen zone #:"
-msgstr "Megjelenítés ezen a képernyõn:"
+msgstr "Megjelenítés ezen a képernyõn #:"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:296
 #: src/modules/conf_desks/e_int_config_desks.c:197
@@ -3705,38 +3531,35 @@ msgstr "%1.0f"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:304
 msgid "Wallpaper Mode"
-msgstr ""
+msgstr "Háttérkép mód"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:306
 msgid "Theme Defined"
-msgstr ""
+msgstr "Téma megadva"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:309
-#, fuzzy
 msgid "Theme Wallpaper"
-msgstr "Témakezelõ"
+msgstr "Téma háttérkép"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:322
-#, fuzzy
 msgid "Custom Screenlock"
-msgstr "Képernyõ zárolás"
+msgstr "Egyéni zárolás"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:323
 msgid "Use custom screenlock"
-msgstr ""
+msgstr "Egyéni zárolás használata"
 
 #: src/modules/conf_desklock/e_mod_main.c:35
 msgid "Screen Lock"
 msgstr "Képernyõ zárolás"
 
 #: src/modules/conf_desks/e_int_config_desks.c:56
-#, fuzzy
 msgid "Virtual Desktops Settings"
-msgstr "Virtuális asztalok"
+msgstr "Virtuális asztal beállítások"
 
 #: src/modules/conf_desks/e_int_config_desks.c:189
 msgid "Number of Desktops"
-msgstr "Asztalok száma"
+msgstr "Munkaasztalok száma"
 
 #: src/modules/conf_desks/e_int_config_desks.c:208
 #: src/modules/conf_desks/e_int_config_desks.c:247
@@ -3749,19 +3572,17 @@ msgstr "Válts asztalt, ha az egér a kép szélén van"
 
 #: src/modules/conf_desks/e_int_config_desks.c:211
 msgid "Animated flip"
-msgstr ""
+msgstr "Animált váltás"
 
 #: src/modules/conf_desks/e_int_config_desks.c:229
 msgid "Desktops"
 msgstr "Asztalok"
 
 #: src/modules/conf_desks/e_int_config_desks.c:248
-#, fuzzy
 msgid "Flip when moving mouse to the screen edge"
 msgstr "Válts asztalt, ha az egér a kép szélén van"
 
 #: src/modules/conf_desks/e_int_config_desks.c:250
-#, fuzzy
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Válts asztalt, ha az egér a kép szélén van"
 
@@ -3778,35 +3599,31 @@ msgstr "%1.1f mp"
 
 #: src/modules/conf_desks/e_int_config_desks.c:256
 msgid "Wrap desktops around when flipping"
-msgstr ""
+msgstr "Forgasd körbe az asztalokat váltáskor"
 
 #: src/modules/conf_desks/e_int_config_desks.c:260
-#, fuzzy
 msgid "Flip Animation"
-msgstr "Információ megjelenítése"
+msgstr "Váltás animáció"
 
 #: src/modules/conf_desks/e_int_config_desks.c:262
 msgid "Off"
-msgstr ""
+msgstr "Ki"
 
 #: src/modules/conf_desks/e_int_config_desks.c:264
-#, fuzzy
 msgid "Pane"
-msgstr "Lapozó"
+msgstr "Szelet"
 
 #: src/modules/conf_desks/e_int_config_desks.c:266
-#, fuzzy
 msgid "Zoom"
-msgstr "Alul"
+msgstr "Nagyítás"
 
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Virtuális asztalok"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:35
-#, fuzzy
 msgid "Dialog Settings"
-msgstr "Beállítási párbeszédablak beállításai"
+msgstr "Párbeszédablak beállításai"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:84
 #: src/modules/conf_engine/e_int_config_engine.c:85
@@ -3821,24 +3638,22 @@ msgid "General Settings"
 msgstr "Általános beállítások"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:86
-#, fuzzy
 msgid "Disable Confirmation Dialogs"
-msgstr "Konfigurációs ablakok"
+msgstr "Jóváhagyási párbeszédablakok tiltása"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:93
-#, fuzzy
 msgid "Default Configuration Dialogs Mode"
-msgstr "Konfigurációs ablakok"
+msgstr "Alapértelmezett konfigurációs párbeszéd mód"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:134
 msgid "Basic Mode"
-msgstr "Alap"
+msgstr "Alap mód"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:136
 msgid "Advanced Mode"
-msgstr "Haladó"
+msgstr "Szakértői mód"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:131
 msgid "Default Dialog Mode"
@@ -3846,7 +3661,7 @@ msgstr "Alapértelmezett párbeszédablak mód"
 
 #: src/modules/conf_dialogs/e_mod_main.c:35
 msgid "Dialogs"
-msgstr ""
+msgstr "Párbeszédablakok"
 
 #: src/modules/conf_display/e_int_config_display.c:133
 #, c-format
@@ -3855,20 +3670,20 @@ msgid ""
 "<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 ""
-"Ez így jónak tûnik? Ha igen, nyomd meg az <highlight>Igen</highlight> gombot,"
+"Ez így jónak tûnik? Ha igen, nyomd meg az <hilight>Igen</hilight> gombot,"
 "<br>vagy a Nem gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot sem, az "
-"eredeti, %dx%d@%d felbontás visszaáll %d mp múlva"
+"eredeti, %dx%d @ %d Hz felbontás visszaáll, %d mp múlva"
 
 #: src/modules/conf_display/e_int_config_display.c:140
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at will be "
 "restored in %d seconds."
 msgstr ""
-"Ez így jónak tûnik? Ha igen, nyomd meg az <highlight>Igen</highlight> gombot,"
+"Ez így jónak tûnik? Ha igen, nyomd meg az <hilight>Igen</hilight> gombot,"
 "<br>vagy a Nem gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot sem, az "
-"eredeti, %dx%d@%d felbontás visszaáll %d mp múlva"
+"eredeti, %dx%d @ felbontás visszaáll, %d mp múlva"
 
 #: src/modules/conf_display/e_int_config_display.c:150
 #, c-format
@@ -3877,42 +3692,40 @@ msgid ""
 "<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 ""
-"Ez így jónak tûnik? Ha igen, nyomd meg az <highlight>Igen</highlight> gombot,"
+"Ez így jónak tûnik? Ha igen, nyomd meg az <hilight>Igen</hilight> gombot,"
 "<br>vagy a Nem gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot sem, az "
-"eredeti, %dx%d@%d felbontás <highlight>AZONNAL</highlight> visszaáll."
+"eredeti, %dx%d @ %d Hz felbontás <hilight>AZONNAL</hilight> visszaáll."
 
 #: src/modules/conf_display/e_int_config_display.c:157
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Ez így jónak tûnik? Ha igen, nyomd meg az <highlight>Igen</highlight> gombot,"
+"Ez így jónak tûnik? Ha igen, nyomd meg az <hilight>Igen</hilight> gombot,"
 "<br>vagy a Nem gombot, ha nem.<br>Ha nem nyomsz meg egyetlen gombot sem, az "
-"eredeti, %dx%d@%d felbontás <highlight>AZONNAL</highlight> visszaáll."
+"eredeti, %dx%d felbontás <hilight>AZONNAL</hilight> visszaáll."
 
 #: src/modules/conf_display/e_int_config_display.c:212
 msgid "Resolution change"
-msgstr "Felbontás megváltoztatása"
+msgstr "Felbontás módosítása"
 
 #: src/modules/conf_display/e_int_config_display.c:250
-#, fuzzy
 msgid "Screen Resolution Settings"
-msgstr "Felbontás"
+msgstr "Képernyő felbontás beállítások"
 
 #: src/modules/conf_display/e_int_config_display.c:398
 msgid "Resolution"
 msgstr "Felbontás"
 
 #: src/modules/conf_display/e_int_config_display.c:405
-#, fuzzy
 msgid "Restore on login"
-msgstr "Állítsd vissza a felbontást indításkor!"
+msgstr "Állítsd vissza bejelentkezéskor!"
 
 #: src/modules/conf_display/e_int_config_display.c:410
 msgid "Refresh"
-msgstr "Fríssíts"
+msgstr "Frissítés"
 
 #: src/modules/conf_display/e_int_config_display.c:493
 msgid "Rotation"
@@ -3927,7 +3740,6 @@ msgid "Missing Features"
 msgstr "Hiányzó képességek"
 
 #: src/modules/conf_display/e_int_config_display.c:594
-#, fuzzy
 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,13 +3747,13 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandr support detected."
 msgstr ""
-"Az X szervered nem támogatja a <highlight>Randr</highlight><br>Kiterjesztést"
-"(X Resize and Rotate). Enélkül<br>a kiterjesztésnélkül nem válthatsz "
-"felbontást!"
+"Az X szervered nem támogatja <br>a <hilight>XRandr</hilight><br> "
+"kiterjesztést(X Resize and Rotate).<br> <br>Enélkül a kiterjesztés nélkül "
+"nem válthatsz felbontást!br>"
 
 #: src/modules/conf_display/e_int_config_display.c:606
 msgid "No Refresh Rates Found"
-msgstr ""
+msgstr "Nem találtam frissítési sebességeket"
 
 #: src/modules/conf_display/e_int_config_display.c:607
 msgid ""
@@ -3951,106 +3763,104 @@ msgid ""
 "setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
 "screen."
 msgstr ""
+"Nem jelentett frissítési sebességeket az X kiszolgáló.<br> Ha rejtett X "
+"kiszolgálót használsz,<br> akkor ez megmagyarázza. Akárhogy is, ha nem, "
+"akkor <br>a jelenlegi frissítési sebesség lesz használva akkor, amikor "
+"belbontást<br> állítasz, ami azt eredményezheti, hogy<hilight>sérül</"
+"hilight> a képernyőd."
 
 #: src/modules/conf_display/e_mod_main.c:35
 msgid "Screen Resolution"
-msgstr "Felbontás"
+msgstr "Kijelző felbontása"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:56
 #: src/modules/conf_dpms/e_int_config_dpms.c:77
 msgid "Display Power Management Signaling"
-msgstr ""
+msgstr "Energiakezelés jelzés megjelenítése"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:57
 msgid "The current display server is not <br>DPMS capable."
-msgstr ""
+msgstr "A jelenlegi megjelenítő szerver nem <br>DPMS képes."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:78
 msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
+msgstr "A jelenlegi megjelenítő szervernek nincs <br>DPMS kiterjesztése"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:107
-#, fuzzy
 msgid "Display Power Management Settings"
-msgstr "Képernyõ beállításai"
+msgstr "Energiakezelés beállítások megjelenítése"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:185
 msgid "Enable Display Power Management"
-msgstr ""
+msgstr "Energiakezelés megjelenítésének engedélyezése"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:189
 msgid "Timer(s)"
-msgstr ""
+msgstr "Időmérő(k)"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:191
 msgid "Standby time"
-msgstr ""
+msgstr "Készenléti idő"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:199
-#, fuzzy
 msgid "Suspend time"
-msgstr "Küldd erre az asztalra"
+msgstr "Felfüggesztés ideje"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:207
 msgid "Off time"
-msgstr ""
+msgstr "Kikapcsolási idő"
 
 #: src/modules/conf_dpms/e_mod_main.c:35
 msgid "Power Management"
-msgstr ""
+msgstr "Energiakezelés"
 
 #: src/modules/conf_engine/e_int_config_engine.c:36
-#, fuzzy
 msgid "Engine Settings"
-msgstr "Méret beállításai"
+msgstr "Motor beállítások"
 
 #: src/modules/conf_engine/e_int_config_engine.c:86
-#, fuzzy
 msgid "Enable Composite"
-msgstr "Egyedi betûk engedélyezése"
+msgstr "Összetett engedélyezése"
 
 #: src/modules/conf_engine/e_int_config_engine.c:93
-#, fuzzy
 msgid "Default Engine"
-msgstr "Alapértelmezett asztal"
+msgstr "Alapértelmezett motor"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
-#, fuzzy
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
-msgstr "Egyedi betûk engedélyezése"
+msgstr "Engedélyezed az összetett támogatást?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"Te az összetett támogatás engedélyezését választottad, <br> de a képernyőd "
+"ezt nem támogatja.<br><br> Biztosan engedélyezed?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
-msgstr ""
+msgstr "Meghajtó"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:46
-#, fuzzy
 msgid "Run Command Settings"
-msgstr "Parancs futtatása"
+msgstr "Parancs futtatási beállítások"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:110
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:162
-#, fuzzy
 msgid "Maximum Number of Matched Apps to List"
-msgstr "Maximálisan megjelenített Eapok"
+msgstr "A listában szereplő azonos programok maximális száma"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:166
-#, fuzzy
 msgid "Maximum Number of Matched Exes to List"
-msgstr "Maximálisan megjelenített futtathatók"
+msgstr "Futtathatók maximális száma a listában"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:118
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 msgid "Maximum History to List"
-msgstr ""
+msgstr "A listában szereplő előzmények maximális száma"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:124
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:176
@@ -4069,7 +3879,7 @@ msgstr "Görgetés animálása"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:179
 #: src/modules/conf_winlist/e_int_config_winlist.c:243
 msgid "Scroll Speed"
-msgstr "Görgetés sebessége"
+msgstr "Görgetési sebesség"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:181
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:216
@@ -4083,23 +3893,22 @@ msgid "%1.2f"
 msgstr "%1.2f"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:185
-#, fuzzy
 msgid "Terminal Settings"
-msgstr "Általános beállítások"
+msgstr "Terminál beállítások"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:186
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr ""
+msgstr "Terminál parancs (CTRL+RETURN a használathoz)"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:194
 #: src/modules/conf_winlist/e_int_config_winlist.c:260
 msgid "Size Settings"
-msgstr "Méret beállításai"
+msgstr "Méret beállítások"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:195
 #: src/modules/conf_winlist/e_int_config_winlist.c:261
 msgid "Minimum Width"
-msgstr "Legkissebb szélesség"
+msgstr "Minimum szélesség"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:197
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:201
@@ -4116,17 +3925,17 @@ msgstr "%4.0f"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:199
 #: src/modules/conf_winlist/e_int_config_winlist.c:265
 msgid "Minimum Height"
-msgstr "Legkissebb magasság"
+msgstr "Minimum magasság"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:203
 #: src/modules/conf_winlist/e_int_config_winlist.c:269
 msgid "Maximum Width"
-msgstr "Legnagyobb szélesség"
+msgstr "Maximális szélesség"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:207
 #: src/modules/conf_winlist/e_int_config_winlist.c:273
 msgid "Maximum Height"
-msgstr "Legnagyobb magasság"
+msgstr "Maximális magasság"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:213
 #: src/modules/conf_winlist/e_int_config_winlist.c:249
@@ -4145,351 +3954,364 @@ msgstr "Függõleges elhelyezkedés"
 
 #: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:128
 msgid "Run Command"
-msgstr "Parancs futtatása"
+msgstr "Parancs végrehajtása"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
-msgstr "Bezárás"
+msgstr "Mag"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
-msgstr "Cím"
+msgstr "Címsor"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
-msgstr ""
+msgstr "Szövegmező"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
-msgstr ""
+msgstr "Szövegmező fény"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
-msgstr ""
+msgstr "Szövegmező nagy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
-msgstr "Beállítás"
+msgstr "Címsor beállítása"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
-msgstr "Errõl a témáról"
+msgstr "A címről"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
-msgstr ""
+msgstr "A verzióról"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
-msgstr "Adatok"
+msgstr "A szövegről"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
-msgstr ""
+msgstr "Asztalzár cím"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
-msgstr "Egyéni jelszó:"
+msgstr "Asztalzár jelszó"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
-msgstr ""
+msgstr "Párbeszédablak hiba"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Parancs futtatása"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
-msgstr ""
+msgstr "Splash cím"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
-msgstr ""
+msgstr "Splash szöveg"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
-msgstr ""
+msgstr "Splash verzió"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
-msgstr ""
+msgstr "Belépés"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
-msgstr "Képek másodpercenként"
+msgstr "Keret"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
-msgstr ""
+msgstr "Címke"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
-msgstr "Alul"
+msgstr "Gombok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
-msgstr "Méret"
+msgstr "Csúszka"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
-msgstr ""
+msgstr "Rádió gombok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
-msgstr ""
+msgstr "Gombok ellenörzése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
-msgstr ""
+msgstr "Szöveg lista elem"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
-msgstr ""
+msgstr "Lista elem"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
-msgstr "Fájlkezelõ (Teszt!)"
+msgstr "Fájlkezelõ"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Típus:"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Munkaasztal ikonok megjelenítése"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
-msgstr ""
+msgstr "Kicsi "
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Általános"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
-msgstr ""
+msgstr "Nagy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
-msgstr "Betûtípus beállítások"
+msgstr "Betűtípus-beállítások"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
-msgstr ""
+msgstr "Nagy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
-msgstr ""
+msgstr "Nagyon nagy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
-#, fuzzy, c-format
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
+#, c-format
 msgid "%d pixels"
-msgstr "%1.0f pixel"
+msgstr "%d pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Egyedi betûk engedélyezése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
-msgstr "Betûtípusok"
+msgstr "Betűkészletek"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
-msgstr ""
+msgstr "Alap szöveg előnézet: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
-msgstr "Ikon osztály"
+msgstr "Betű osztályok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
-msgstr "Egyedi betûk engedélyezése"
+msgstr "Betű osztály engedélyezése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
-msgstr "Nincs simítás"
+msgstr "Megjelenítési információk (hinting)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bájtkód"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Háttér betûtípusok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Betûtípus neve"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Háttér betûtípusok engedélyezése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr ""
+msgstr "Speciális szöveg előnézet.. 我真的会写中文"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:54
-#, fuzzy
 msgid "Icon Theme Settings"
-msgstr "Gyorstár beállítások"
+msgstr "Ikon téma beállítások"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:279
-#, fuzzy
 msgid "Icon Themes"
-msgstr "Téma"
+msgstr "Ikon témák"
 
 #: src/modules/conf_icon_theme/e_mod_main.c:35
-#, fuzzy
 msgid "Icon Theme"
-msgstr "Téma"
+msgstr "Ikon téma"
 
 #: src/modules/conf_imc/e_int_config_imc.c:109
-#, fuzzy
 msgid "Input Method Configuration"
-msgstr "IBox beállítások"
+msgstr "Beviteli mód beállítások"
 
 #: src/modules/conf_imc/e_int_config_imc.c:297
-#, fuzzy
 msgid "Input Method Selector"
-msgstr "Beviteli mód hiba"
+msgstr "Beviteli mód választó"
 
 #: src/modules/conf_imc/e_int_config_imc.c:300
 #: src/modules/conf_imc/e_int_config_imc.c:890
-#, fuzzy
 msgid "Use No Input Method"
-msgstr "Beviteli mód hiba"
+msgstr "Nincs beviteli mód"
 
 #: src/modules/conf_imc/e_int_config_imc.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:957
 msgid "Setup Selected Input Method"
-msgstr ""
+msgstr "Kiválasztott beviteli mód beállítása"
 
 #: src/modules/conf_imc/e_int_config_imc.c:897
 msgid "New"
 msgstr "Új"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
-msgstr ""
+msgstr "Importálás..."
 
 #: src/modules/conf_imc/e_int_config_imc.c:904
-#, fuzzy
 msgid "Input Method Parameters"
-msgstr "Beviteli mód hiba"
+msgstr "Beviteli mód paraméterei"
 
 #: src/modules/conf_imc/e_int_config_imc.c:914
-#, fuzzy
 msgid "Execute Command"
-msgstr "Parancs futtatása"
+msgstr "Parancs végrehajtása"
 
 #: src/modules/conf_imc/e_int_config_imc.c:921
-#, fuzzy
 msgid "Setup Command"
 msgstr "Parancs futtatása"
 
 #: src/modules/conf_imc/e_int_config_imc.c:930
 msgid "Exported Environment Variables"
-msgstr ""
+msgstr "Környezeti változók exportálása"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Configuration..."
-msgstr "IBox beállítások"
+msgstr "Válassz egy beviteli mód beállítást"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
-#, fuzzy
 msgid "Input Method Config Import Error"
-msgstr "IBox beállítások"
+msgstr "Beviteli mód beállítás importálás hiba"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:282
-#, fuzzy
 msgid ""
 "Enlightenment was unable to import the configuration.<br><br>Are you sure "
 "this is really a valid configuration?"
-msgstr "Az E17 nem tudta elindítani a következõ programot:<br><br>%s<br><br>"
+msgstr ""
+"Az E17 nem tudja importálni a beállítást.<br><br> Biztos vagy benne, hogy ez "
+"egy érvényes beállítás?"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:297
-#, fuzzy
 msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
-msgstr ""
-"Az Enlightenment képtelen volt új folyamatot elágaztatni:<br><br>%s<br>"
+msgstr "Az E17 nem tudja importálni a beállítást<br> egy másolási hiba miatt."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#, fuzzy
 msgid "Language"
-msgstr "Kezelõ"
+msgstr "Nyelv"
 
 #: src/modules/conf_imc/e_mod_main.c:35
-#, fuzzy
 msgid "Input Method Settings"
-msgstr "Beviteli mód hiba"
+msgstr "Beviteli mód beállítások"
 
-#: src/modules/conf_intl/e_int_config_intl.c:582
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
 #, fuzzy
-msgid "Language Configuration"
-msgstr "Lapozó beállítások"
+msgid "Interaction Settings"
+msgstr "Kijelölés beállítások"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixel"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pixel/mp"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f mp"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
 #, fuzzy
+msgid "Interaction"
+msgstr "Belső"
+
+#: src/modules/conf_intl/e_int_config_intl.c:582
+msgid "Language Configuration"
+msgstr "Nyelvi beállítások"
+
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
-msgstr "Témakezelõ"
+msgstr "Nyelv választó"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
-msgstr ""
+msgstr "Területi beállítás kiválasztva"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
-#, fuzzy
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
-msgstr "Nem tudtam zárolni a képernyõt!"
+msgstr "Területi beállítás"
 
 #: src/modules/conf_intl/e_mod_main.c:35
-#, fuzzy
 msgid "Language Settings"
-msgstr "Menü beállítások"
+msgstr "Nyelvi beállítások"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:6
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:10
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:3
 msgid "<None>"
-msgstr "<Nincs>"
+msgstr "<None>"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#, fuzzy
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
-"Kérlek üsd le a billentyûkombinációt,<br> vagy a <highlight>Escape</"
-"highlight> gombot"
+"Kérlek üsd le a billentyûkombinációt,<br><br> vagy nyomd meg az "
+"<hilight>Escape</hilight> gombot a megszakításhoz."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:91
 msgid "Key Binding Settings"
@@ -4498,61 +4320,55 @@ msgstr "Billentyûkombináció beállítások"
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:227
 #: src/modules/conf_keybindings/e_mod_main.c:35
 msgid "Key Bindings"
-msgstr "Billentyûkombinációk"
+msgstr "Gyorsbillentyűk"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:232
-#, fuzzy
 msgid "Add Key"
-msgstr "Új billentyûkombináció"
+msgstr "Billentyű hozzáadása"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:235
-#, fuzzy
 msgid "Delete Key"
-msgstr "Töröl"
+msgstr "Billentyű törlése"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 msgid "Modify Key"
-msgstr ""
+msgstr "Billentyű módosítása"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:311
-#, fuzzy
 msgid "Delete All"
-msgstr "Töröl"
+msgstr "Mind törlése"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#, fuzzy
 msgid "Restore Default Bindings"
-msgstr "Billentyûkombináció törlése"
+msgstr "Alapértelmezettek visszaállítása"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:252
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Action"
-msgstr "Akció"
+msgstr "Művelet"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:259
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:328
-#, fuzzy
 msgid "Action Params"
-msgstr "Paraméterek"
+msgstr "Művelet paraméterei"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:927
-#, fuzzy
 msgid "Key Binding Sequence"
-msgstr "Billentyûkombináció"
+msgstr "Billentyûkombináció sorrend"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1142
-#, fuzzy, c-format
+#, 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 ""
-"Ez a kombináció már használatban van.<br>Kérlek adj meg egy másik "
-"billenytûkombinációt"
+"Ez a kombináció már használatban van a <br><hilight>%s</hilight> folyamat "
+"által.<br>Kérlek adj meg egy másik billenytûkombinációt."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1147
 msgid "Binding Key Error"
-msgstr "Billentyűkombináció Hiba"
+msgstr "Billentyűkombináció hiba"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1289
 msgid "CTRL"
@@ -4574,7 +4390,7 @@ msgstr "WIN"
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34
 msgid "Keyboard & Mouse"
-msgstr ""
+msgstr "Billentyűzet és egér"
 
 #: src/modules/conf_menus/e_int_config_menus.c:44
 #: src/modules/conf_menus/e_int_config_menus.c:110
@@ -4585,26 +4401,23 @@ msgstr "Menü beállítások"
 
 #: src/modules/conf_menus/e_int_config_menus.c:101
 #: src/modules/conf_menus/e_int_config_menus.c:160
-#, fuzzy
 msgid "Main Menu Settings"
-msgstr "Menü beállítások"
+msgstr "Főmenü beállítások"
 
 #: src/modules/conf_menus/e_int_config_menus.c:102
 #: src/modules/conf_menus/e_int_config_menus.c:161
-#, fuzzy
 msgid "Show Favorites In Main Menu"
 msgstr "Kedvencek menü megjelenítése"
 
 #: src/modules/conf_menus/e_int_config_menus.c:105
 #: src/modules/conf_menus/e_int_config_menus.c:164
-#, fuzzy
 msgid "Show Applications In Main Menu"
-msgstr "Ablakok menü megjelenítése"
+msgstr "Alkalmazások menü megjelenítése"
 
 #: src/modules/conf_menus/e_int_config_menus.c:111
 #: src/modules/conf_menus/e_int_config_menus.c:170
 msgid "Show Name In Menu"
-msgstr "Név mutatása a menüben"
+msgstr "Név megjelenítése a menüben"
 
 #: src/modules/conf_menus/e_int_config_menus.c:114
 #: src/modules/conf_menus/e_int_config_menus.c:173
@@ -4640,7 +4453,7 @@ msgstr "Autoscroll mutató margók"
 #: src/modules/conf_menus/e_int_config_menus.c:194
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:145
 msgid "Miscellaneous Options"
-msgstr "Más opciók"
+msgstr "Egyéb beállítások"
 
 #: src/modules/conf_menus/e_int_config_menus.c:195
 msgid "Menu Scroll Speed"
@@ -4666,58 +4479,50 @@ msgid "Click Drag Timeout"
 msgstr "Klikk vontatás idõtúllépés"
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%2.2f seconds"
-msgstr "%2.1f mp"
+msgstr "%2.2f másodperc"
 
 #: src/modules/conf_mime/e_int_config_mime.c:64
 #: src/modules/conf_mime/e_mod_main.c:35
-#, fuzzy
 msgid "File Icons"
-msgstr "Információk:"
+msgstr "Fájlikonok"
 
 #: src/modules/conf_mime/e_int_config_mime.c:196
-#, fuzzy
 msgid "File Types"
-msgstr "Fájl"
+msgstr "Fájltípusok"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:69
-#, fuzzy
 msgid "File Icon"
-msgstr "Információk:"
+msgstr "Fájl ikon"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
-#, fuzzy
 msgid "Mime:"
-msgstr "Teljes méretû"
+msgstr "Forma:"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:147
 msgid "Use Generated Thumbnail"
-msgstr ""
+msgstr "Generált előnézeti kép használata"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:150
-#, fuzzy
 msgid "Use Theme Icon"
-msgstr "Ikon eltávolítása"
+msgstr "Téma ikon használata"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:153
 msgid "Use Edje File"
-msgstr ""
+msgstr "Edje fájl használata"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:156
-#, fuzzy
 msgid "Use Image"
-msgstr "Nyújtás"
+msgstr "Kép használata"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:159
-#, fuzzy
 msgid "Use Default"
-msgstr "Alapértelmezett asztal"
+msgstr "Felhasználói alapértelmezés"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:270
-#, fuzzy
 msgid "Select an Edj File"
-msgstr "Válassz egy ablakot!"
+msgstr "Válassz egy Edj fájlt"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
 msgid ""
@@ -4725,53 +4530,50 @@ msgid ""
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
 "highlight> to abort."
 msgstr ""
+"Kérlek várj a változtatásokkal, <br>és nyomd meg bármelyik gombot az egéren, "
+"<br> vagy görgest a görgőt, hogy engedélyezd az egér műveletet.<br> A "
+"megszakításhoz nyomj <hilight>Mégse</highlight>-t."
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
-#, fuzzy
 msgid "Mouse Binding Settings"
-msgstr "Billentyûkombináció beállítások"
+msgstr "Egér műveletek beállítása"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
 #: src/modules/conf_mousebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Bindings"
-msgstr "Billentyûkombinációk"
+msgstr "Egér műveletek"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
-#, fuzzy
 msgid "Add Binding"
-msgstr "Billentyûkombináció"
+msgstr "Művelet hozzáadása"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:303
-#, fuzzy
 msgid "Delete Binding"
-msgstr "Billentyûkombináció"
+msgstr "Művelet törlése"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:307
-#, fuzzy
 msgid "Modify Binding"
-msgstr "Billentyûkombináció"
+msgstr "Művelet módosítása"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
 msgid "Restore Mouse and Wheel Binding Defaults"
-msgstr ""
+msgstr "Alapértelmezett műveletek visszaállítása"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:335
-#, fuzzy
 msgid "Action Context"
-msgstr "Mûködési környezet"
+msgstr "Művelet környezet"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
 msgid "Any"
-msgstr "Bármilyen"
+msgstr "Bármely"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 msgid "Win List"
-msgstr "Ablaklista"
+msgstr "Ablak lista"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:353
 msgid "Popup"
-msgstr "Felbukkanó ablak"
+msgstr "Felbukkanó"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:357
 msgid "Zone"
@@ -4783,18 +4585,17 @@ msgstr "Tároló"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:365
 msgid "Manager"
-msgstr "Kezelõ"
+msgstr "Kezelő"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1296
-#, fuzzy
 msgid "Mouse Binding Sequence"
-msgstr "Billentyûkombináció"
+msgstr "Egér művelet sorozat"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:35
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:97
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:146
 msgid "Cursor Settings"
-msgstr "Mutató beállításai"
+msgstr "Kurzor Beállítások"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:99
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:148
@@ -4808,73 +4609,61 @@ msgstr "X kurzor használata"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:152
 msgid "Cursor Size"
-msgstr "Mutató mérete"
-
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixel"
+msgstr "Kurzor mérete"
 
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
-msgstr "Egérmutató"
+msgstr "Egér Kurzor"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:35
-#, fuzzy
 msgid "Mouse Acceleration Settings"
-msgstr "Kijelölési beállítások"
+msgstr "Egér sebesség beállítások"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:91
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Acceleration"
-msgstr "Modul mûveletek"
+msgstr "Egér gyorsítás"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:93
-#, fuzzy
 msgid "Acceleration"
-msgstr "Gyorsuló"
+msgstr "Gyorsítás"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:99
 msgid "Threshold"
-msgstr ""
+msgstr "Küszöb"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
 msgid "Search Path Configuration"
-msgstr "Keresési utak beállítása"
+msgstr "Keresési útvonal beállítások"
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
-msgstr ""
+msgstr "Adat"
 
 #: src/modules/conf_paths/e_int_config_paths.c:75
-#, fuzzy
 msgid "Images"
-msgstr "Mozaik"
+msgstr "Képek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
-msgstr "Téma"
+msgstr "Témák"
 
 #: src/modules/conf_paths/e_int_config_paths.c:81
-#, fuzzy
 msgid "Init"
-msgstr "Beágyazott"
+msgstr "Init (indítókép)"
 
 #: src/modules/conf_paths/e_int_config_paths.c:87
-#, fuzzy
 msgid "Backgrounds"
-msgstr "Háttér"
+msgstr "Hátterek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:89
 msgid "Messages"
-msgstr ""
+msgstr "Ãœzenetek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:171
 msgid "E Paths"
-msgstr "E utak"
+msgstr "E Útvonalak"
 
 #: src/modules/conf_paths/e_int_config_paths.c:202
 msgid "Default Directories"
@@ -4882,11 +4671,11 @@ msgstr "Alapértelmezett könyvtárak"
 
 #: src/modules/conf_paths/e_int_config_paths.c:209
 msgid "User Defined Directories"
-msgstr "Felhasználói könyvtárak"
+msgstr "Felhasználó könyvtárak"
 
 #: src/modules/conf_paths/e_mod_main.c:35
 msgid "Search Directories"
-msgstr "Alapértelmezett könyvtárak"
+msgstr "Könyvtárak keresése"
 
 #: src/modules/conf_performance/e_int_config_performance.c:39
 msgid "Performance Settings"
@@ -4895,7 +4684,7 @@ msgstr "Teljesítmény beállítások"
 #: src/modules/conf_performance/e_int_config_performance.c:91
 #: src/modules/conf_performance/e_int_config_performance.c:124
 msgid "Framerate"
-msgstr "Képek másodpercenként"
+msgstr "Képkocka-arány (fps)"
 
 #: src/modules/conf_performance/e_int_config_performance.c:93
 #: src/modules/conf_performance/e_int_config_performance.c:126
@@ -4909,20 +4698,20 @@ msgstr "Gyorstár beállítások"
 
 #: src/modules/conf_performance/e_int_config_performance.c:131
 msgid "Cache Flush Interval"
-msgstr "Gyorstár ürítési intervallum"
+msgstr "Gyorstár takarítási időköz"
 
 #: src/modules/conf_performance/e_int_config_performance.c:136
 msgid "Size Of Font Cache"
-msgstr "Betû-gyorstár mérete"
+msgstr "Betűkészlet gyorstár mérete"
 
 #: src/modules/conf_performance/e_int_config_performance.c:138
 #, c-format
 msgid "%1.1f MB"
-msgstr "%1.0f MB"
+msgstr "%1.1f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:141
 msgid "Size Of Image Cache"
-msgstr "Kép-gyorstár mérete"
+msgstr "Kép gyorstár mérete"
 
 #: src/modules/conf_performance/e_int_config_performance.c:143
 #, c-format
@@ -4931,404 +4720,428 @@ msgstr "%1.0f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Number Of Edje Files To Cache"
-msgstr "Ennyi Edje fájl kerüljön a gyorstárba"
+msgstr "A gyorstárban tárolt Edje fájlok száma"
 
 #: src/modules/conf_performance/e_int_config_performance.c:148
 #, c-format
 msgid "%1.0f files"
-msgstr "%1.0f fájl"
+msgstr "%1.0f fájlok"
 
 #: src/modules/conf_performance/e_int_config_performance.c:151
 msgid "Number Of Edje Collections To Cache"
-msgstr "Ennyi Edje gyûjtemény kerüljön a gyorstárba"
+msgstr "Gyorstárba tárolt Edje gyűjtemények száma"
 
 #: src/modules/conf_performance/e_int_config_performance.c:153
 #, c-format
 msgid "%1.0f collections"
-msgstr "%1.0f gyûjtemény"
+msgstr "%1.0f gyűjtemény"
 
 #: src/modules/conf_performance/e_mod_main.c:35
 msgid "Performance"
 msgstr "Teljesítmény"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:53
-#, fuzzy
 msgid "Profile Selector"
-msgstr "Témakezelõ"
+msgstr "Profil választó"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:82
-#, fuzzy
 msgid "Available Profiles"
-msgstr "Elérhető elemek"
+msgstr "A rendelkezésre álló profilok"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:91
-#, fuzzy
 msgid "Select"
-msgstr "Töröl"
+msgstr "Kijelölés"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:212
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "profile?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"A \"%s\" törlését kérted.<br><br>Biztosan törölni szeretnéd ezt a profilt?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:215
-#, fuzzy
 msgid "Are you sure you want to delete this profile?"
-msgstr "Biztosan törölni akarod a <br><b>%s</b> nevû fájlt?"
+msgstr "Biztosan törölni szeretnéd ezt a profilt?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:262
 msgid "Add New Profile"
-msgstr ""
+msgstr "Új profil hozzáadása"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:276
-#, fuzzy
 msgid "Plain Profile"
-msgstr "Tulajdonságok"
+msgstr "Egyszerű profil"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:280
 msgid "Clone Current Profile"
-msgstr ""
+msgstr "Jelenlegi profil klónozása"
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "Tulajdonságok"
+msgstr "Profilok"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:49
-#, fuzzy
 msgid "Screen Saver Settings"
-msgstr "Görgetési beállítások"
+msgstr "Képernyővédő beállítások"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:112
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:144
-#, fuzzy
 msgid "Enable X screensaver"
-msgstr "Képernyõvédõ engedélyezése"
+msgstr "X képernyővédő engedélyezése"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:115
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:147
 msgid "Screensaver Timer(s)"
-msgstr ""
+msgstr "Képernyővédő számláló(k)"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:117
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:149
-#, fuzzy
 msgid "Time until X screensaver starts"
-msgstr "Várakozási idõ a képernyõvédõ indításáig"
+msgstr "Az idő, miután bekapcsol a képernyővédő"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:155
-#, fuzzy
 msgid "Time until X screensaver alternates"
-msgstr "Várakozási idõ a képernyõvédõ indításáig"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f mp"
+msgstr "Az idő, miután az X képernyővédő vált"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
-#, fuzzy
 msgid "Blanking"
-msgstr "Sima"
+msgstr "Ãœresen hagy"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:166
 msgid "Preferred"
-msgstr ""
+msgstr "Javasolt"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:168
 msgid "Not Preferred"
-msgstr ""
+msgstr "Nem javasolt"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:172
 msgid "Exposure Events"
-msgstr ""
+msgstr "Exponálás események"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:176
-#, fuzzy
 msgid "Allow"
-msgstr "Ritkán"
+msgstr "Engedélyezés"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:178
 msgid "Don't Allow"
-msgstr ""
+msgstr "Ne engedélyezd"
 
 #: src/modules/conf_screensaver/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Saver"
-msgstr "Képernyõterület"
+msgstr "Képernyővédő"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
-msgstr "Polc beállításai"
+msgstr "Polc beállítások"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:71
 msgid "Configured Shelves"
 msgstr "Beállított polcok"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "shelf?"
 msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+"A \"%s\" törlését kérted. <br><br>biztosan törölni szeretnéd ezt a polcot?"
 
 #: src/modules/conf_startup/e_int_config_startup.c:39
 msgid "Startup Settings"
 msgstr "Indítási beállítások"
 
 #: src/modules/conf_startup/e_int_config_startup.c:334
-#, fuzzy
 msgid "Show Splash Screen on Login"
-msgstr "Nyitókép megjelenítése indításkor"
+msgstr "Splash képernyő megjelenítése a bejelentkezésnél"
 
 #: src/modules/conf_startup/e_mod_main.c:35
 #: src/modules/conf_transitions/e_int_config_transitions.c:134
 msgid "Startup"
 msgstr "Indítás"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
-msgstr "Témakezelõ"
+msgstr "Téma választó"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
-msgstr "Témakezelõ"
+msgstr "Téma kategóriák"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
-msgstr ""
+msgstr "Hozzárendelés"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
-msgstr "Közeli"
+msgstr "Törlés"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
-msgstr "Töröl"
+msgstr "Az összes törlése"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:66
 msgid "Select a Theme..."
-msgstr ""
+msgstr "Válassz egy témát..."
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:276
 #: src/modules/conf_theme/e_int_config_theme_import.c:285
 msgid "Theme Import Error"
-msgstr ""
+msgstr "Téma importálás hiba"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:277
 msgid ""
 "Enlightenment was unable to import the theme.<br><br>Are you sure this is "
 "really a valid theme?"
 msgstr ""
+"Az Enightenment nem tudja ezt a témát importálni. <br><br>Biztos, hogy ez "
+"egy érvényes téma?"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:286
-#, fuzzy
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr ""
-"Az Enlightenment képtelen volt új folyamatot elágaztatni:<br><br>%s<br>"
+"Az Enlightenment nem tudja importálni a témát, <br> másolási hiba miatt."
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
-#, fuzzy
 msgid "Transition Settings"
-msgstr "Elhelyezési beállítások"
+msgstr "Átmenet beállítások"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:126
 msgid "Events"
-msgstr ""
+msgstr "Események"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:135
 msgid "Desk Change"
-msgstr ""
+msgstr "Asztal módosítás"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:136
-#, fuzzy
 msgid "Background Change"
-msgstr "Háttér"
+msgstr "Háttér módosítás"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:144
 #: src/modules/conf_transitions/e_mod_main.c:35
-#, fuzzy
 msgid "Transitions"
-msgstr "Mulandóság"
+msgstr "Átmenetek"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
-msgstr "Terelési beállítások"
+msgstr "Háttérkép beállítások"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
-msgstr ""
+msgstr "A téma hátterének használata"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
-msgstr "Beállítás..."
+msgstr "Kép..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
+msgstr "Átmenet..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
-msgstr ""
+msgstr "A háttérkép helye"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
-msgstr "Minden asztal"
+msgstr "Minden munkaasztal"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
-msgstr "Ez az asztal"
+msgstr "Ez a munkaasztal"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
-msgstr "Képernyõ"
+msgstr "Ez a képernyő"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
 msgid "Create a gradient..."
-msgstr ""
+msgstr "Átmenet létrehozása..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
 msgid "Color 1:"
-msgstr ""
+msgstr "1. szín:"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
 msgid "Color 2:"
-msgstr ""
+msgstr "2. szín:"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
-#, fuzzy
 msgid "Fill Options"
-msgstr "Beállítások"
+msgstr "Kitöltés beállítások"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:227
-#, fuzzy
 msgid "Horizontal"
-msgstr "Vízszintesen"
+msgstr "Vízszintes"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:229
-#, fuzzy
 msgid "Vertical"
-msgstr "Fuggõlegesen"
+msgstr "Függőleges"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
 msgid "Diagonal Up"
-msgstr ""
+msgstr "Átlós fel"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
 msgid "Diagonal Down"
-msgstr ""
+msgstr "Átlós le"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
 msgid "Radial"
-msgstr ""
+msgstr "Sugaras"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:369
-#, fuzzy
 msgid "Gradient Creation Error"
-msgstr "Hiba az alkalmazás végrehajtásakor"
+msgstr "Átmenet létrehozási hiba"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
 msgid "For some reason, Enlightenment was unable to create a gradient."
-msgstr ""
+msgstr "Valamilyen oknál fogva, az E17 nem képes létrehozni az átmenetet."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
-msgstr "Ikon-forrás"
+msgstr "Válassz egy képet..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:156
-#, fuzzy
 msgid "Fill and Stretch Options"
-msgstr "Más opciók"
+msgstr "Kitöltés és nyújtás bállítások"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:159
-#, fuzzy
 msgid "Stretch"
-msgstr "Indítás"
+msgstr "Nyújtás"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
-#, fuzzy
 msgid "Center"
-msgstr "Tároló"
+msgstr "Középre"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:169
-#, fuzzy
 msgid "Tile"
-msgstr "Cím"
+msgstr "Csempe"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:174
-#, fuzzy
 msgid "Within"
-msgstr "Szélesség"
+msgstr "Belül"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:179
-#, fuzzy
 msgid "Fill"
-msgstr "Nyírd ki!"
+msgstr "Kitöltés"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:186
-#, fuzzy
 msgid "File Quality"
-msgstr "Jóminõségû"
+msgstr "Fájl minőség"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:188
 msgid "Use original file"
-msgstr ""
+msgstr "Eredeti fájl használata"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "%3.0f%%"
-msgstr "%3.0f"
+msgstr "%3.0f%%"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:504
 msgid "Picture Import Error"
-msgstr ""
+msgstr "Kép importálás hiba"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:505
-#, fuzzy
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
-msgstr "Az E17 nem tudta elindítani a következõ programot:<br><br>%s<br><br>"
+msgstr ""
+"Az Enlightenment nem képes importálni a képet, <br> átalakítási hibák miatt."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
-msgstr ""
+msgstr "Háttérkép importálás hiba"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
-msgstr "Az E17 nem tudta elindítani a következõ programot:<br><br>%s<br><br>"
+msgstr ""
+"Az Enlightenment nem tudja a háttérképet importálni, <br>egy másolási hiba "
+"miatt."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
+"Az Enlightenment nem tudja importálni a háttérképet. <br><br>Biztos vagy "
+"benne, hogy ez egy érvényes háttérkép?"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
 msgid "Wallpaper"
-msgstr ""
+msgstr "Háttérkép"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:54
 #: src/modules/conf_window_display/e_mod_main.c:35
@@ -5337,67 +5150,68 @@ msgstr "Ablak megjelenítés"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:161
 msgid "Display"
-msgstr "Képernyõ"
+msgstr "Megjelenítés"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:162
 msgid "Show window geometry information when moving or resizing"
-msgstr "Mutassa az ablak helyét amikor mozgatom"
+msgstr ""
+"Mutasd az ablak geometriai információit mozgatáskor, vagy átméretezéskor"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:164
 #: src/modules/conf_window_display/e_int_config_window_display.c:212
 msgid "Animate the shading and unshading of windows"
-msgstr "Animáld az ablakok árnyékolását"
+msgstr "Ablak árnyékolások animálása"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:168
 #: src/modules/conf_window_display/e_int_config_window_display.c:227
 msgid "Automatic New Window Placement"
-msgstr "Új ablak automatikus helyre kerül"
+msgstr "Új ablakok automatikus elhelyezése"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:170
 #: src/modules/conf_window_display/e_int_config_window_display.c:230
 msgid "Smart Placement"
-msgstr "Okos elhelyezés"
+msgstr "Intelligens elhelyezés"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:172
 #: src/modules/conf_window_display/e_int_config_window_display.c:232
 msgid "Don't hide Gadgets"
-msgstr "Ne rejtse el a kütyüket"
+msgstr "Ne rejtsd el a modulokat"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:174
 #: src/modules/conf_window_display/e_int_config_window_display.c:234
 msgid "Place at mouse pointer"
-msgstr "Helyezd az egérmutatóhoz"
+msgstr "Helyezd el az egérmutatónál"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:176
 #: src/modules/conf_window_display/e_int_config_window_display.c:236
 msgid "Place manually with the mouse"
-msgstr "Manuális elhelyezés az egér segítségével"
+msgstr "Manuálisan helyezd el az egérrel"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:178
 #: src/modules/conf_window_display/e_int_config_window_display.c:238
 msgid "Automatically switch to desktop of new window"
-msgstr ""
+msgstr "Automatikusan válts asztalt új ablaknál"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:194
 msgid "Window Move Geometry"
-msgstr "Ablak mozgatása"
+msgstr "Ablak mozgatás geometria"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:196
 #: src/modules/conf_window_display/e_int_config_window_display.c:204
 msgid "Display information"
-msgstr "Információ megjelenítése"
+msgstr "Megjelenítés információ"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:198
 msgid "Follow the window as it moves"
-msgstr "Kövesd az ablakot, ahogy az mozog"
+msgstr "Kövesd az ablakot, ahogy mozog"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:202
 msgid "Window Resize Geometry"
-msgstr "Ablak átméretezése"
+msgstr "Ablak átméretezés geometria"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:206
 msgid "Follow the window as it resizes"
-msgstr "Kövesd az ablakot, ahogy átméretezõdik"
+msgstr "Kövesd az ablakot, ahogy átméreteződik"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:210
 msgid "Window Shading"
@@ -5409,39 +5223,35 @@ msgstr "Lineáris"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:219
 msgid "Smooth accelerate and decelerate"
-msgstr "Egyenletesen gyorsuló és lassuló"
+msgstr "Sima gyorsítás és lassítás"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:221
 msgid "Accelerate"
-msgstr "Gyorsuló"
+msgstr "Gyorsítás"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:223
 msgid "Decelerate"
-msgstr "Lassuló"
+msgstr "Lassítás"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:242
-#, fuzzy
 msgid "Window Border"
-msgstr "Ablak szerepe"
+msgstr "Ablakkeret"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:245
-#, fuzzy
 msgid "Prefer user defined icon"
-msgstr "Felhasználói akciók"
+msgstr "Felhasználó által megadott ikon előnyben"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:247
-#, fuzzy
 msgid "Prefer application provided icon"
-msgstr "Az alkalmazás ikonjának használata"
+msgstr "Alkalmazás által nyújtott ikon előnyben"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:251
-#, fuzzy
 msgid "Internal Windows"
-msgstr "Ablakok alatt"
+msgstr "Belső ablakok"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:253
 msgid "Always remember internal windows"
-msgstr ""
+msgstr "Mindig emlékezz a belső ablakokra"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
@@ -5449,15 +5259,15 @@ msgstr "Fókusz beállítások"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:165
 msgid "Click Window to Focus"
-msgstr "Kattintáskor fókusz"
+msgstr "A fókuszáláshoz kattints az ablakra"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:167
 msgid "Window under the Mouse"
-msgstr "Az egér alatti ablak"
+msgstr "Ablak az egér alatt"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:169
 msgid "Most recent Window under the Mouse"
-msgstr "A legutolsó egér alatti ablak"
+msgstr "Legújabb ablakok az egér alatt"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:183
 msgid "Focus"
@@ -5465,7 +5275,7 @@ msgstr "Fókusz"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:185
 msgid "Click to focus"
-msgstr "Klikk a fókuszhoz"
+msgstr "Kattints a fókuszáláshoz"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:187
 msgid "Pointer focus"
@@ -5473,122 +5283,117 @@ msgstr "Mutató fókusz"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:189
 msgid "Sloppy focus"
-msgstr "Laza fókusz"
+msgstr "Hanyag fókusz"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:193
 msgid "New Window Focus"
-msgstr "Új ablakok fókusz szabályai"
+msgstr "Új ablak fókusz"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:195
 msgid "No new windows get focus"
-msgstr "Új ablakok nem kapnak fókuszt"
+msgstr "Nem új ablakok fókuszálása"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:197
 msgid "All new windows get focus"
-msgstr "Minden új ablak kap fókuszt"
+msgstr "Minden új ablaknak lesz fókusza"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:199
 msgid "Only new dialogs get focus"
-msgstr "Csak új párbeszédablakok kapnak fókuszt"
+msgstr "Csak az új párbeszédablakoknak van fókusza"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:201
 msgid "Only new dialogs get focus if the parent has focus"
-msgstr ""
-"Csak új párbeszédablakok kapnak fókuszt, ha a szülõ rendelkezik a fókusszal"
+msgstr "Csak az új párbeszédablakoknak lesz fókusza, ha a szülőnek már van"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:205
 msgid "Other Settings"
-msgstr "Más beállítások"
+msgstr "Egyéb beállítások"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:206
 msgid "Always pass on caught click events to programs"
-msgstr "Mindig továbbítsa az eseményeket a programoknak"
+msgstr "Mindig továbbítsd az észlelt kattintásokat a programoknak"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
-msgstr "Kattintás egy ablakra elõtérbe hozza azt"
+msgstr "Egy kattintás az ablakon előtérbe helyezi azt"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:210
 msgid "A click in a window always focuses it"
-msgstr "Kattintás egy ablakra fókuszálja azt"
+msgstr "Egy kattintás az ablakba mindig felemeli"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
-msgstr "Asztalváltáskor az utolsó fókusz visszaadása"
+msgstr "Munkasztal váltáskor a legutolsó fokuszált ablak újrafókuszálása"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:214
 msgid "Revert focus when hiding or closing a window"
-msgstr "Fókusz visszatér egy ablak bezárásakor"
+msgstr "Fókusz visszaállítása elrejtésnél, vagy ablak bezárásnál"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:216
 msgid "Slide pointer to a new focused window"
-msgstr ""
+msgstr "Csúsztasd a mutatót az újonnan megnyitot, fókuszált ablakra"
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 msgid "Window Focus"
-msgstr "Fókusz"
+msgstr "Ablak fókusz"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:53
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
 msgid "Window Manipulation"
-msgstr "Ablakváltozások"
+msgstr "Ablak manipuláció"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:146
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:178
 msgid "Automatically raise windows on mouse over"
-msgstr "Automatikusan kerüljön felülre az ablak, ha az egér felette van"
+msgstr "Ablak automatikus felemélese, ha az egérmutató felette van"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:148
 msgid "When moving or resizing windows, resist at the boundaries"
-msgstr ""
-"Amikor egy ablakot mozgat vagy átméretez, a határvonalakon ne engedje át"
+msgstr "Ablak áthelyzésekor, átméretezésekor, állj ellen a határoknál"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:152
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:213
 msgid "Maximize Policy"
-msgstr "Maximalizálási szabályok"
+msgstr "Maximalizálási házirend"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:156
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:217
 msgid "Smart expansion"
-msgstr "Okos kiterjesztés"
+msgstr "Intelligens expanzió"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:158
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:219
 msgid "Expand the window"
-msgstr "Terjeszd ki az ablakot"
+msgstr "Ablak kiterjesztése"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:160
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:221
 msgid "Fill available space"
-msgstr "Elérhetõ hely kitöltése"
+msgstr "Kitöltés az elérhető helyre"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:177
 msgid "Autoraise"
-msgstr "Automatikusan kiemelkedés"
+msgstr "Auto emelés"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:180
 msgid "Delay before raising:"
-msgstr "Várj ennyit, mielõtt kiemeled:"
+msgstr "Késleltetés az emelés elött:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:186
-#, fuzzy
 msgid "Raise Window"
-msgstr "Következő ablak"
+msgstr "Ablak előtérbe hozása"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:188
 msgid "Raise when starting to move or resize"
-msgstr ""
+msgstr "Előtérbe hozás indításkor, mozgatáskor és átméretezéskor"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:190
-#, fuzzy
 msgid "Raise when clicking to focus"
-msgstr "Klikk a fókuszhoz"
+msgstr "Előtérbe hozás amikor a fókuszra kattint"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:192
-#, fuzzy
 msgid "Allow windows to be above fullscreen window"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Az ablakok eltakarhatják a teljes képernyős ablakot"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:196
 msgid "Resistance"
@@ -5596,149 +5401,197 @@ msgstr "Ellenállás"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:197
 msgid "Resist moving or resizing a window over an obstacle"
-msgstr "Ne engedd egy akadály felett átméretezni, vagy átvinni az ablakot"
+msgstr ""
+"Ne engedd az ablak mozgatását, átméretezését egy akadályon (bizonyos ponton) "
+"túl"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:199
 msgid "Resistance between windows:"
-msgstr "Ablakok közti ellenállás:"
+msgstr "Ellenállás az ablakok között:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:203
 msgid "Resistance at the edge of the screen:"
-msgstr "Ellenállás a képernyõ szélén:"
+msgstr "Ellenállás a képernyő széléig"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:207
 msgid "Resistance to desktop gadgets:"
-msgstr "Kütyük ellenállása:"
+msgstr "Ellenállás az asztali muduloknak"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:225
-#, fuzzy
 msgid "Both directions"
-msgstr "Modul mûveletek"
+msgstr "Mindkettő"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:232
-#, fuzzy
 msgid "Allow window manipulation"
-msgstr "Ablakváltozások"
+msgstr "Ablak manipukáció engedélyezése"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:234
-#, fuzzy
 msgid "Automatically move/resize windows on shelf autohide"
-msgstr "Automatikusan kerüljön felülre az ablak, ha az egér felette van"
+msgstr "Automatikus ablak mozgatás/átméretezés polc elrejtéskor"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Ablak emlékek"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Emlékezések beállítása"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Alapértelmezések"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Ikonnév"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Osztály"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Osztály"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Cím"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Cím"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Szerep"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<None>"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
-msgstr "Az ablaklista beállításai"
+msgstr "Ablak lista beállítások"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:132
 msgid "Show iconified windows"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Ikonizált ablakok mutatása"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:134
-#, fuzzy
 msgid "Show iconified windows from other desks"
-msgstr "Minden ablak, minden virtuális asztalról"
+msgstr "Ikonizált ablakok mutattás minden asztalról"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:136
-#, fuzzy
 msgid "Show iconified windows from other screens"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Ikonizált ablakok mutatása más képernyőkről is"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:138
 msgid "Show windows from other desks"
-msgstr "Minden ablak, minden virtuális asztalról"
+msgstr "Ablakok mutatása minden asztalról"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:140
 msgid "Show windows from other screens"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Ablakok mutatása más képernyőkről is"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
 #: src/modules/conf_winlist/e_int_config_winlist.c:218
 msgid "Selection Settings"
-msgstr "Kijelölési beállítások"
+msgstr "Kijelölés beállítások"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:145
 #: src/modules/conf_winlist/e_int_config_winlist.c:219
 msgid "Focus window while selecting"
-msgstr "Ablak fókuszt kap kiválasztáskor"
+msgstr "Ablak fókuszálása a kiválasztás alatt"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:147
 #: src/modules/conf_winlist/e_int_config_winlist.c:221
 msgid "Raise window while selecting"
-msgstr "Ablak elõtérbe kerül kiválasztáskor"
+msgstr "Ablak kiemelése a kiválasztás alatt"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:149
 #: src/modules/conf_winlist/e_int_config_winlist.c:223
 msgid "Warp mouse to window while selecting"
-msgstr "Egér terelése az ablakhoz kiválasztáskor"
+msgstr "Egér görbítése az ablakra a kiválasztás közben"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:151
 #: src/modules/conf_winlist/e_int_config_winlist.c:225
 msgid "Uncover windows while selecting"
-msgstr "Ablakok kitakarása kiválasztáskor"
+msgstr "Ablak kitakarása a kiválasztás alatt"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:153
 #: src/modules/conf_winlist/e_int_config_winlist.c:227
 msgid "Jump to desk while selecting"
-msgstr "Asztalra ugrás kiválasztáskor"
+msgstr "Ugrás az asztalra a kiválasztás alatt"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:157
 #: src/modules/conf_winlist/e_int_config_winlist.c:231
 msgid "Warp Settings"
-msgstr "Terelési beállítások"
+msgstr "Görbítés beállítások"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:158
 #: src/modules/conf_winlist/e_int_config_winlist.c:232
 msgid "Warp At End"
-msgstr "Tereld a végére"
+msgstr "Görbítés a végén"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:234
 msgid "Warp Speed"
-msgstr "Terelés sebessége"
+msgstr "Görbítés sebessége"
 
 #: src/modules/cpufreq/e_mod_main.c:130
 msgid "Cpufreq"
-msgstr "Cpufreq"
+msgstr "Cpufrek"
 
 #: src/modules/cpufreq/e_mod_main.c:177
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Gyakran (0,5mp)"
+msgstr "Gyors (4 ütem)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Közepes (1mp)"
+msgstr "Közepes (8 ütem)"
 
 #: src/modules/cpufreq/e_mod_main.c:191
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normális (2mp)"
+msgstr "Normál (32 ütem)"
 
 #: src/modules/cpufreq/e_mod_main.c:198
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Ritkán (5mp)"
+msgstr "Lassú (64 ütem)"
 
 #: src/modules/cpufreq/e_mod_main.c:205
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Nagyon ritkán (30mp)"
+msgstr "Nagyon lassú (256 ütem)"
 
 #: src/modules/cpufreq/e_mod_main.c:220
 msgid "Manual"
-msgstr "Manuális"
+msgstr "Kézi"
 
 #: src/modules/cpufreq/e_mod_main.c:224
 msgid "Lower Power Automatic"
-msgstr "Alacsony felhasználású automatikus"
+msgstr "Alacsony energia automatika"
 
 #: src/modules/cpufreq/e_mod_main.c:226
 msgid "Minimum Speed"
-msgstr "Min. sebesség"
+msgstr "Minimum sebesség"
 
 #: src/modules/cpufreq/e_mod_main.c:228
 msgid "Maximum Speed"
-msgstr "Max. sebesség"
+msgstr "Maximális sebesség"
 
 #: src/modules/cpufreq/e_mod_main.c:250
 #, c-format
@@ -5748,29 +5601,29 @@ msgstr "%i MHz"
 #: src/modules/cpufreq/e_mod_main.c:252
 #, c-format
 msgid "%i.%i GHz"
-msgstr "%i.%i GHz"
+msgstr "%i.%i Ghz"
 
 #: src/modules/cpufreq/e_mod_main.c:269
 msgid "Time Between Updates"
-msgstr "Frissítések közti idõ"
+msgstr "Frissítések közötti idő"
 
 #: src/modules/cpufreq/e_mod_main.c:275
 msgid "Restore CPU Power Policy"
-msgstr "CPU energia-szabály visszaállítása"
+msgstr "CPU energiakezelési házirend helyreállítása"
 
 #: src/modules/cpufreq/e_mod_main.c:281
 msgid "Set CPU Power Policy"
-msgstr "CPU energia-szabály létrehozása"
+msgstr "CPU energiakezelési házirendjének beállítása"
 
 #: src/modules/cpufreq/e_mod_main.c:288
 msgid "Set CPU Speed"
-msgstr "Sebesség beállítása"
+msgstr "CPU sebesség beállítása"
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid ""
 "There was an error trying to set the<br>cpu frequency governor via the "
 "module's<br>setfreq utility."
-msgstr "Hiba a processzor setfreq-en keresztüli órajel-vezérlõ<br>állításakor"
+msgstr "Hiba történt a <br>processzor frekveciabeálítása közben.<br>"
 
 #: src/modules/cpufreq/e_mod_main.c:363
 msgid ""
@@ -5778,34 +5631,35 @@ msgid ""
 "missing<br>Kernel modules or features, or your CPU<br>simply does not "
 "support this feature."
 msgstr ""
-"A kerneled nem támogatja az órajel-vezérlést.<br>Hiányozhat a kernelbõl a "
-"modul,<br>vagy egyszerûen a processzorod nem támogatja ezt a funkciót."
+"A kerneled nem támogatja a <br>processzor sebesség beálítását. Hiányzó "
+"<br>kernel modulok lehetnek, vagy csak egyszerűen a processzor<br> nem "
+"támogatja ezt a funkciót."
 
 #: src/modules/cpufreq/e_mod_main.c:383
 msgid ""
 "There was an error trying to set the<br>cpu frequency setting via the "
 "module's<br>setfreq utility."
-msgstr "Hiba a processzor órajelének setfreq-en keresztüli<br>átállítakor"
+msgstr "Hiba történt a <br>processzor frekveciabeálítása közben.<br>"
 
 #: src/modules/dropshadow/e_mod_config.c:40
 msgid "Dropshadow Configuration"
-msgstr "Áírnyékoló beállítások"
+msgstr "Árnyékolási beállítások"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
-msgstr "Minõség"
+msgstr "Minőség"
 
 #: src/modules/dropshadow/e_mod_config.c:111
 msgid "High Quality"
-msgstr "Jóminõségû"
+msgstr "Magas minőség"
 
 #: src/modules/dropshadow/e_mod_config.c:113
 msgid "Medium Quality"
-msgstr "Közepes minõségû"
+msgstr "Közepes minőség"
 
 #: src/modules/dropshadow/e_mod_config.c:115
 msgid "Low Quality"
-msgstr "Alacsony minõségû"
+msgstr "Alacsony minőség"
 
 #: src/modules/dropshadow/e_mod_config.c:119
 msgid "Blur Type"
@@ -5813,11 +5667,11 @@ msgstr "Elmosás típusa"
 
 #: src/modules/dropshadow/e_mod_config.c:122
 msgid "Very Fuzzy"
-msgstr "Nagyon bolyhos"
+msgstr "Nagyon életlen"
 
 #: src/modules/dropshadow/e_mod_config.c:124
 msgid "Fuzzy"
-msgstr "Bolyhos"
+msgstr "Életlen"
 
 #: src/modules/dropshadow/e_mod_config.c:128
 msgid "Sharp"
@@ -5829,15 +5683,15 @@ msgstr "Nagyon éles"
 
 #: src/modules/dropshadow/e_mod_config.c:134
 msgid "Shadow Distance"
-msgstr "Árnyék távolsága"
+msgstr "Árnyék távolság"
 
 #: src/modules/dropshadow/e_mod_config.c:137
 msgid "Very Far"
-msgstr "Nagyon messzi"
+msgstr "Nagyon távoli"
 
 #: src/modules/dropshadow/e_mod_config.c:139
 msgid "Far"
-msgstr "Messzi"
+msgstr "Távoli"
 
 #: src/modules/dropshadow/e_mod_config.c:141
 msgid "Near"
@@ -5848,17 +5702,16 @@ msgid "Very Near"
 msgstr "Nagyon közeli"
 
 #: src/modules/dropshadow/e_mod_config.c:145
-#, fuzzy
 msgid "Extremely Near"
-msgstr "Nagyon közeli"
+msgstr "Nagyon-nagyon közeli"
 
 #: src/modules/dropshadow/e_mod_config.c:147
 msgid "Underneath"
-msgstr "Alatta"
+msgstr "Alatt, alul, lent"
 
 #: src/modules/dropshadow/e_mod_config.c:151
 msgid "Shadow Darkness"
-msgstr "Árnyék sötétsége"
+msgstr "Árnyék sötétség"
 
 #: src/modules/dropshadow/e_mod_config.c:154
 msgid "Very Dark"
@@ -5870,28 +5723,25 @@ msgstr "Sötét"
 
 #: src/modules/dropshadow/e_mod_config.c:158
 msgid "Light"
-msgstr "Halvány"
+msgstr "Világos"
 
 #: src/modules/dropshadow/e_mod_config.c:160
 msgid "Very Light"
-msgstr "Nagyon halvány"
+msgstr "Nagyon világos"
 
 #: src/modules/dropshadow/e_mod_main.c:90
 msgid "Dropshadow"
-msgstr ""
+msgstr "Árnyékdobás"
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
-#, fuzzy
 msgid "Run Command Dialog"
-msgstr "Parancs futtatása"
+msgstr "Parancs párbeszédablak futtatása"
 
 #: src/modules/fileman/e_mod_main.c:209
-#, fuzzy
 msgid "Files"
-msgstr "Fájl"
+msgstr "Fájlok"
 
 #: src/modules/fileman/e_mod_main.c:261
-#, fuzzy
 msgid ""
 "Fileman Module Configuration data needed upgrading. Your old "
 "configuration<br>has been wiped and a new set of defaults initialized. "
@@ -5901,16 +5751,12 @@ msgid ""
 "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 ""
-"A beállításokat tartalmazó állományok elvultak, ezért<br>újakat kellett "
-"készíteni. Minden eddigi beállítás törlõdött,<br>de ez a felylesztés "
-"folyamán gyakran megesik majd. KéRüNK,<br>HOGY NE JELENTS HIBáT! Annyi "
-"történt, hogy a használhatóság<br>érdekében az Enlighenmentnek ú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>"
+"A fájlkezelő modul konfigurációs adata frissítést igényel. A régi beállítás "
+"<br>törölve lett, és az új alap beállítás lett azonosítva. Ez <br>a "
+"feljelsztés közben természetes, ezért ne jelentsd <br>hibaként. Elnézésedet "
+"kérjük a kellemetlenségekért."
 
 #: src/modules/fileman/e_mod_main.c:274
-#, fuzzy
 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 "
@@ -5919,99 +5765,88 @@ msgid ""
 "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 Enlightenmenté. "
-"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>"
+"A fájlkezelő modul beállításaid újabbak a modul verziójánál. Ez nagyon <br> "
+"furcsa. Ez nem történhetne meg, csak abban az esetben, ha "
+"visszaállítottad<br> volna egy korábbi verzióra, vagy átmásoltad a "
+"konfigurációs fájltr egy<br> régebbi modulba. Ez rossz, <br>és az "
+"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:343
-#, fuzzy
 msgid "Fileman Configuration Updated"
-msgstr "A beállításokat frissítettem!"
+msgstr "Fájlkezelő beállítások frissítve"
 
 #: src/modules/fileman/e_mod_config.c:82
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "Méret beállításai"
+msgstr "Fájlkezelő beállítások"
 
 #: src/modules/fileman/e_mod_config.c:159
-#, fuzzy
 msgid "Grid Icons"
-msgstr "Információk:"
+msgstr "Rács Ikonok"
 
 #: src/modules/fileman/e_mod_config.c:161
-#, fuzzy
 msgid "Custom Icons"
-msgstr "Illeszkedés az ikonokra"
+msgstr "Egyéni Ikonok"
 
 #: src/modules/fileman/e_mod_config.c:163
-#, fuzzy
 msgid "Custom Grid Icons"
-msgstr "Illeszkedés az ikonokra"
+msgstr "Egyéni rács ikonok"
 
 #: src/modules/fileman/e_mod_config.c:166
 msgid "Custom Smart Grid Icons"
-msgstr ""
+msgstr "Egyéni, intelligens rács ikonok"
 
 #: src/modules/fileman/e_mod_config.c:173
-#, fuzzy
 msgid "Icon Size"
-msgstr "Ikon méret"
+msgstr "Ikonméret"
 
 #: src/modules/fileman/e_mod_config.c:179
 msgid "Open Dirs In Place"
-msgstr ""
+msgstr "Könyvtárak megnyitása helyben"
 
 #: src/modules/fileman/e_mod_config.c:182
 msgid "Sort Dirs First"
-msgstr ""
+msgstr "Először rendezd a könyvtárakat"
 
 #: src/modules/fileman/e_mod_config.c:185
 msgid "Use Single Click"
-msgstr ""
+msgstr "Egy kattintás használata"
 
 #: src/modules/fileman/e_mod_config.c:188
-#, fuzzy
 msgid "Show Icon Extension"
-msgstr "Nevek megjelenítése"
+msgstr "Ikon kiterjesztés megjelenítése"
 
 #: src/modules/fileman/e_mod_config.c:191
 msgid "Show Full Path"
-msgstr ""
+msgstr "Teljes útvonal megjelenítése"
 
 #: src/modules/fileman/e_mod_config.c:194
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Ez az asztal"
+msgstr "Munkaasztal ikonok megjelenítése"
 
 #: src/modules/fileman/e_mod_config.c:197
-#, fuzzy
 msgid "Show Toolbar"
-msgstr "Követõ megjelenítése"
+msgstr "Az eszköztár megjelenítése"
 
 #: src/modules/fileman/e_fwin.c:654
-#, fuzzy
 msgid "Go to Parent Directory"
-msgstr "Új könyvtár"
+msgstr "Vissza az előző könyvtárba"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
-msgstr ""
+msgstr "Megnyitás"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
-msgstr ""
+msgstr "Megnyitás ezzel..."
 
-#: src/modules/fileman/e_fwin.c:1323
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
-msgstr "Alkalmazás"
+msgstr "Megadott alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:1394
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
-msgstr "Parancs futtatása"
+msgstr "Egyéni parancs"
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:50
 #: src/modules/winlist/e_mod_main.c:63 src/modules/winlist/e_mod_main.c:64
@@ -6028,62 +5863,54 @@ msgstr "Előző ablak"
 
 #: src/modules/winlist/e_winlist.c:141
 msgid "Select a window"
-msgstr "Válassz egy ablakot!"
+msgstr "Válassz egy ablakot"
 
 #: src/modules/ibar/e_mod_config.c:55
 msgid "IBar Configuration"
-msgstr "IBar tulajdonságok"
+msgstr "IBar beállítások"
 
 #: src/modules/ibar/e_mod_config.c:101
 msgid "Selected Bar Source"
-msgstr "Ikon-forrás"
+msgstr "Kijelölt IBar forrás"
 
 #: src/modules/ibar/e_mod_config.c:122
-#, fuzzy
 msgid "Icon Labels"
-msgstr "Nevek megjelenítése"
+msgstr "Ikon címkék"
 
 #: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:94
 msgid "Show Icon Label"
-msgstr "Nevek megjelenítése"
+msgstr "Ikon címke megjelenítése"
 
 #: src/modules/ibar/e_mod_config.c:129
-#, fuzzy
 msgid "Display App Name"
-msgstr "Képernyõ"
+msgstr "Alkalmazás nevének megjelenítése"
 
 #: src/modules/ibar/e_mod_config.c:133
-#, fuzzy
 msgid "Display App Comment"
-msgstr "Mértékegység"
+msgstr "Megjegyzés megjelenítése"
 
 #: src/modules/ibar/e_mod_config.c:137
-#, fuzzy
 msgid "Display App Generic"
-msgstr "Mértékegység"
+msgstr "Általános megjelenítés"
 
 #: src/modules/ibar/e_mod_config.c:167
-#, fuzzy
 msgid "Create new IBar source"
-msgstr "Új könyvtár"
+msgstr "Új IBar forrás létrehozása"
 
 #: src/modules/ibar/e_mod_config.c:168
 msgid "Enter a name for this new source:"
-msgstr ""
+msgstr "Adj meg egy nevet az új forrásnak:"
 
 #: src/modules/ibar/e_mod_config.c:183
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
-msgstr ""
-"Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
-"akarod?"
+msgstr "A \"%s\" törlését kérted.<br><br> Biztosan törölni szeretnéd?"
 
 #: src/modules/ibar/e_mod_config.c:187
-#, fuzzy
 msgid "Are you sure you want to delete this bar source?"
-msgstr "Biztosan törölni akarod a <br><b>%s</b> nevû fájlt?"
+msgstr "Biztosan törölni szeretnéd?"
 
 #: src/modules/ibar/e_mod_main.c:211
 msgid "IBar"
@@ -6091,154 +5918,132 @@ msgstr "IBar"
 
 #: src/modules/ibar/e_mod_main.c:799
 msgid "Change Icon Properties"
-msgstr "Ikon tulajdonságainak megváltoztatása"
+msgstr "Ikon tulajdonságok módosítása"
 
 #: src/modules/ibar/e_mod_main.c:804
 msgid "Remove Icon"
 msgstr "Ikon eltávolítása"
 
 #: src/modules/ibar/e_mod_main.c:814
-#, fuzzy
 msgid "Add An Icon"
-msgstr "Alkalmazás"
+msgstr "Ikon hozzáadása"
 
 #: src/modules/ibar/e_mod_main.c:821
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Ikon készítése"
+msgstr "Új ikon létrehozása"
 
 #: src/modules/ibar/e_mod_main.c:837
-#, fuzzy
 msgid "Add Application"
-msgstr "Alkalmazás"
+msgstr "Alkalmazás hozzáadása"
 
 #: src/modules/ibox/e_mod_config.c:48
 msgid "IBox Configuration"
-msgstr "IBox beállítások"
+msgstr "IBox beállítás"
 
 #: src/modules/ibox/e_mod_config.c:97
-#, fuzzy
 msgid "Display Name"
-msgstr "Képernyõ"
+msgstr "Név megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:99
-#, fuzzy
 msgid "Display Title"
-msgstr "Mértékegység"
+msgstr "Cím megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:101
-#, fuzzy
 msgid "Display Class"
-msgstr "Képernyõ"
+msgstr "Osztály megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:103
-#, fuzzy
 msgid "Display Icon Name"
-msgstr "Mértékegység"
+msgstr "Ikon név megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Információ megjelenítése"
+msgstr "Szegély felirat megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:130
-#, fuzzy
 msgid "Show windows from all screens"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Ablakok megjelenítése az összes képernyőről"
 
 #: src/modules/ibox/e_mod_config.c:135
-#, fuzzy
 msgid "Show windows from current screen"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Ablakok megjelenítése az aktuális képernyőről"
 
 #: src/modules/ibox/e_mod_config.c:144
-#, fuzzy
 msgid "Show windows from all desktops"
-msgstr "Minden ablak, minden virtuális asztalról"
+msgstr "Minden asztal ablakainak megjelenítése"
 
 #: src/modules/ibox/e_mod_config.c:149
-#, fuzzy
 msgid "Show windows from active desktop"
-msgstr "Minden ablak, minden virtuális asztalról"
+msgstr "Ablakok megjelenítése az aktív asztalról"
 
 #: src/modules/ibox/e_mod_main.c:221
 msgid "IBox"
-msgstr ""
+msgstr "IBox"
 
 #: src/modules/pager/e_mod_config.c:69
 msgid "Pager Configuration"
 msgstr "Lapozó beállítások"
 
 #: src/modules/pager/e_mod_config.c:116 src/modules/pager/e_mod_config.c:155
-#, fuzzy
 msgid "Flip desktop on mouse wheel"
-msgstr "Válts asztalt, ha az egér a kép szélén van"
+msgstr "Asztal váltás az egérgörgővel"
 
 #: src/modules/pager/e_mod_config.c:119 src/modules/pager/e_mod_config.c:158
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Ez az asztal"
+msgstr "Munkaasztal nevek megjelenítése"
 
 #: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:198
-#, fuzzy
 msgid "Popup Settings"
-msgstr "Felbukkanási beállítások"
+msgstr "Felugró ablakok beállításai"
 
 #: src/modules/pager/e_mod_config.c:125 src/modules/pager/e_mod_config.c:199
-#, fuzzy
 msgid "Show popup on desktop change"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Asztal váltáskor mutasd"
 
 #: src/modules/pager/e_mod_config.c:128
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Sürgős ablakoknak"
 
 #: src/modules/pager/e_mod_config.c:162
-#, fuzzy
 msgid "Select and Slide button"
-msgstr "Válassz egy ablakot!"
+msgstr "Kijelölés és csúsztatás gomb"
 
 #: src/modules/pager/e_mod_config.c:164 src/modules/pager/e_mod_config.c:171
 #: src/modules/pager/e_mod_config.c:178 src/modules/pager/e_mod_config.c:386
 #: src/modules/pager/e_mod_config.c:391 src/modules/pager/e_mod_config.c:396
-#, fuzzy, c-format
+#, c-format
 msgid "Click to set"
-msgstr "Klikk a fókuszhoz"
+msgstr "Beállításhoz kattint"
 
 #: src/modules/pager/e_mod_config.c:169
 msgid "Drag and Drop button"
-msgstr ""
+msgstr "Fogd és vidd gomb"
 
 #: src/modules/pager/e_mod_config.c:176
-#, fuzzy
 msgid "Drag whole desktop"
-msgstr "Virtuális asztal"
+msgstr "Húzd az egész asztalt"
 
 #: src/modules/pager/e_mod_config.c:185
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Billentyűfolyamat felugró ablak magassága"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:193
 #: src/modules/pager/e_mod_config.c:204
 #, c-format
 msgid "%.0f px"
-msgstr "%.0f pixel"
+msgstr "%.0f px"
 
 #: src/modules/pager/e_mod_config.c:191
-#, fuzzy
 msgid "Resistance to dragging"
-msgstr "Ablakok közti ellenállás:"
+msgstr "Ellenállás a fogásnak"
 
 #: src/modules/pager/e_mod_config.c:202
-#, fuzzy
 msgid "Popup pager height"
-msgstr "Felbukkanási sebesség"
+msgstr "Felugró lapozó magasság"
 
 #: src/modules/pager/e_mod_config.c:207 src/modules/pager/e_mod_config.c:221
-#, fuzzy
 msgid "Popup speed"
-msgstr "Felbukkanási sebesség"
+msgstr "Felugró sebessége"
 
 #: src/modules/pager/e_mod_config.c:209 src/modules/pager/e_mod_config.c:223
 #, c-format
@@ -6246,37 +6051,33 @@ msgid "%1.1f seconds"
 msgstr "%1.1f másodperc"
 
 #: src/modules/pager/e_mod_config.c:214
-#, fuzzy
 msgid "Urgent Window Settings"
-msgstr "Az ablaklista beállításai"
+msgstr "Sürgős ablak beállításai"
 
 #: src/modules/pager/e_mod_config.c:215
-#, fuzzy
 msgid "Show popup on urgent window"
-msgstr "Ikonizált ablakok megjelenítése"
+msgstr "Felugró megjelenítése a sürgős ablakon"
 
 #: src/modules/pager/e_mod_config.c:218
-#, fuzzy
 msgid "Popup on urgent window sticks on the screen"
-msgstr "Minden ablak, minden képernyõrõl"
+msgstr "Felugró és sürgős ablak címkék a képernyőn"
 
 #: src/modules/pager/e_mod_config.c:271
 msgid "Pager Button Grab"
-msgstr ""
+msgstr "Lapozó gomb elkapás"
 
 #: src/modules/pager/e_mod_config.c:273
-#, fuzzy
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
-"Kérlek üsd le a billentyûkombinációt,<br> vagy a <highlight>Escape</"
-"highlight> gombot"
+"Kérlek nyomj meg egy gombot az egéren.<br> Nyomj <hilight>Escape-et</"
+"hilight> a megszakításhoz. <br>Vagy a <hilight>Del-t</hilight>a gomb "
+"törléséhez."
 
 #: src/modules/pager/e_mod_config.c:328
-#, fuzzy
 msgid "Attetion"
-msgstr "Akció"
+msgstr "Figyelem"
 
 #: src/modules/pager/e_mod_config.c:329
 msgid ""
@@ -6284,1419 +6085,192 @@ msgid ""
 "already taken by internal<br>code for context menus. <br>This button only "
 "works in the Popup"
 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_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
-#, fuzzy, c-format
+#, c-format
 msgid "Button %i"
-msgstr "Alul"
+msgstr "%i gomb"
 
 #: src/modules/pager/e_mod_main.c:810
-#, fuzzy
 msgid "Virtual Desktops Configuration"
-msgstr "Virtuális asztalok"
+msgstr "Virtuális asztal beállítások"
 
 #: src/modules/pager/e_mod_main.c:2806
-#, fuzzy
 msgid "Show Pager Popup"
-msgstr "Felbukkanási beállítások"
+msgstr "Lapozó felugró ablak megjelenítése"
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
-#, fuzzy
 msgid "Popup Desk Right"
-msgstr "Váltás a jobb oldali asztalra"
+msgstr "Felugró asztal jobbra"
 
 #: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2847
-#, fuzzy
 msgid "Popup Desk Left"
-msgstr "Váltás a bal oldali asztalra"
+msgstr "Felugró asztal balra"
 
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
 msgid "Popup Desk Up"
-msgstr "Váltás a feljebbi sztalra"
+msgstr "Felugró asztal fel"
 
 #: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
 msgid "Popup Desk Down"
-msgstr "Váltása a lejjebbi asztalra"
+msgstr "Felugró asztal le"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Indítás"
 
 #: src/modules/temperature/e_mod_config.c:63
 msgid "Temperature Configuration"
-msgstr "Hõmérsékleti beállítások"
+msgstr "Hőmérsékleti beállítások"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
-msgstr "Mértékegység"
+msgstr "Mértékegységek megjelenítése"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
-msgstr "Frissítési gyakoriság"
+msgstr "Ellenőrzési időköz"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
-msgstr "Gyakran"
+msgstr "Gyors"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
-msgstr "Ritkán"
+msgstr "Lassú"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
-msgstr "Nagyon ritkán"
+msgstr "Nagyon lassú"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
-msgstr "Magas hõmérséklet"
+msgstr "Magas hőmérséklet"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
-msgstr "Alacsony hõmérséklet"
+msgstr "Alacsony hőmérséklet"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
-msgstr "Szenzorok"
+msgstr "Érzékelők"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
-msgstr "Hõmérséklet"
+msgstr "Hőmérséklet"
 
 #: src/modules/wizard/e_wizard.c:341
-#, fuzzy
 msgid "Welcome to Enlightenment 東京"
-msgstr "Az Enlightenmentrõl"
+msgstr "Üdvözlünk az Enlightenmentben 東京"
 
 #: src/modules/wizard/e_wizard.c:343
 msgid "Next"
-msgstr ""
+msgstr "Következő"
 
 #: src/modules/wizard/e_wizard.c:344
-#, fuzzy
 msgid "Back"
-msgstr "Alap"
+msgstr "Vissza"
 
 #: src/modules/wizard/page_010.c:25
-#, fuzzy
 msgid "Choose Language"
-msgstr "Kezelõ"
-
-#~ msgid "NO INFO"
-#~ msgstr "NINCS ADAT"
-
-#~ msgid "NO BAT"
-#~ msgstr "NINCS üTõ"
-
-#, fuzzy
-#~ msgid "Application Categories"
-#~ msgstr "Alkalmazás"
-
-#, fuzzy
-#~ msgid "Danish"
-#~ msgstr "Részletes"
-
-#, fuzzy
-#~ msgid "French"
-#~ msgstr "Fahrenheit"
-
-#, fuzzy
-#~ msgid "German"
-#~ msgstr "Általános"
-
-#, fuzzy
-#~ msgid "Portuguese"
-#~ msgstr "Tulajdonságok"
-
-#, fuzzy
-#~ msgid "Slovak"
-#~ msgstr "Ritkán"
-
-#, fuzzy
-#~ msgid "Amharic"
-#~ msgstr "Automatikus"
-
-#, fuzzy
-#~ msgid "Aragonese"
-#~ msgstr "Ikonok rendezése"
-
-#, fuzzy
-#~ msgid "Blin"
-#~ msgstr "Sima"
-
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Egyéni"
-
-#, fuzzy
-#~ msgid "Faroese"
-#~ msgstr "Messzi"
-
-#, fuzzy
-#~ msgid "Manx"
-#~ msgstr "Manuális"
-
-#, fuzzy
-#~ msgid "Hindi"
-#~ msgstr "Nincs simítás"
-
-#, fuzzy
-#~ msgid "Croatian"
-#~ msgstr "Forgatás"
-
-#, fuzzy
-#~ msgid "Tyap"
-#~ msgstr "Típus:"
-
-#, fuzzy
-#~ msgid "Khmer"
-#~ msgstr "Más"
-
-#, fuzzy
-#~ msgid "Lingala"
-#~ msgstr "Lineáris"
-
-#, fuzzy
-#~ msgid "Lao"
-#~ msgstr "Alacsony"
-
-#, fuzzy
-#~ msgid "Nepali"
-#~ msgstr "Közeli"
-
-#, fuzzy
-#~ msgid "Pashto"
-#~ msgstr "Gyakran"
-
-#, fuzzy
-#~ msgid "Romanian"
-#~ msgstr "Forgatás"
-
-#, fuzzy
-#~ msgid "Sanskrit"
-#~ msgstr "Indítás"
-
-#, fuzzy
-#~ msgid "Somali"
-#~ msgstr "Általános"
-
-#, fuzzy
-#~ msgid "Albanian"
-#~ msgstr "Sima"
-
-#, fuzzy
-#~ msgid "Swati"
-#~ msgstr "Indítás"
-
-#, fuzzy
-#~ msgid "Tamil"
-#~ msgstr "Cím"
-
-#, fuzzy
-#~ msgid "Tigre"
-#~ msgstr "Cím"
-
-#, fuzzy
-#~ msgid "Tatar"
-#~ msgstr "Indítás"
-
-#, fuzzy
-#~ msgid "Vietnamese"
-#~ msgstr "Átnevez"
-
-#, fuzzy
-#~ msgid "Antarctica"
-#~ msgstr "Automatikus"
-
-#, fuzzy
-#~ msgid "Australia"
-#~ msgstr "Automatikusan kiemelkedés"
-
-#, fuzzy
-#~ msgid "Austria"
-#~ msgstr "Automatikusan kiemelkedés"
-
-#, fuzzy
-#~ msgid "Bahamas"
-#~ msgstr "Paraméterek"
-
-#, fuzzy
-#~ msgid "Belgium"
-#~ msgstr "Közepes"
-
-#, fuzzy
-#~ msgid "Belize"
-#~ msgstr "Polc mérete"
-
-#, fuzzy
-#~ msgid "Chad"
-#~ msgstr "Árnyékolt"
-
-#, fuzzy
-#~ msgid "Chile"
-#~ msgstr "Fájl"
-
-#, fuzzy
-#~ msgid "China"
-#~ msgstr "Töltés"
-
-#, fuzzy
-#~ msgid "Denmark"
-#~ msgstr "Sötét"
-
-#, fuzzy
-#~ msgid "Djibouti"
-#~ msgstr "Adatok"
-
-#, fuzzy
-#~ msgid "France"
-#~ msgstr "Mégse"
-
-#, fuzzy
-#~ msgid "Guinea"
-#~ msgstr "Lineáris"
-
-#, fuzzy
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Lineáris"
-
-#, fuzzy
-#~ msgid "Haiti"
-#~ msgstr "Nincs simítás"
-
-#, fuzzy
-#~ msgid "Kuwait"
-#~ msgstr "Minõség"
-
-#, fuzzy
-#~ msgid "Liberia"
-#~ msgstr "Lineáris"
-
-#, fuzzy
-#~ msgid "Mali"
-#~ msgstr "Manuális"
-
-#, fuzzy
-#~ msgid "Mayotte"
-#~ msgstr "Kinézet"
-
-#, fuzzy
-#~ msgid "Mexico"
-#~ msgstr "Más"
-
-#, fuzzy
-#~ msgid "Myanmar"
-#~ msgstr "Kezelõ"
-
-#, fuzzy
-#~ msgid "Nauru"
-#~ msgstr "Közeli"
-
-#, fuzzy
-#~ msgid "Nepal"
-#~ msgstr "Közeli"
-
-#, fuzzy
-#~ msgid "Niger"
-#~ msgstr "Közeli"
-
-#, fuzzy
-#~ msgid "Norway"
-#~ msgstr "Általános"
-
-#, fuzzy
-#~ msgid "Pakistan"
-#~ msgstr "Sima"
-
-#, fuzzy
-#~ msgid "Palau"
-#~ msgstr "Sima"
-
-#, fuzzy
-#~ msgid "Panama"
-#~ msgstr "Paraméterek"
-
-#, fuzzy
-#~ msgid "Peru"
-#~ msgstr "Lapozó"
-
-#, fuzzy
-#~ msgid "Pitcairn"
-#~ msgstr "Hely"
-
-#, fuzzy
-#~ msgid "Poland"
-#~ msgstr "Sima"
-
-#, fuzzy
-#~ msgid "Qatar"
-#~ msgstr "Indítás"
-
-#, fuzzy
-#~ msgid "Reunion"
-#~ msgstr "Felbontás"
-
-#, fuzzy
-#~ msgid "Senegal"
-#~ msgstr "Általános"
-
-#, fuzzy
-#~ msgid "Seychelles"
-#~ msgstr "Polcok"
-
-#, fuzzy
-#~ msgid "Somalia"
-#~ msgstr "Általános"
-
-#, fuzzy
-#~ msgid "Spain"
-#~ msgstr "Csoportosítás"
-
-#, fuzzy
-#~ msgid "Sweden"
-#~ msgstr "Képernyõ"
-
-#, fuzzy
-#~ msgid "United States"
-#~ msgstr "Ikonizált állapot"
-
-#, fuzzy
-#~ msgid "Uzbekistan"
-#~ msgstr "Ellenállás"
-
-#, fuzzy
-#~ msgid "Vanuatu"
-#~ msgstr "Manuális"
-
-#, fuzzy
-#~ msgid "Yemen"
-#~ msgstr "Téma"
-
-#, fuzzy
-#~ msgid "Pager Settings"
-#~ msgstr "Terelési beállítások"
-
-#, fuzzy
-#~ msgid "Urgent window"
-#~ msgstr "Következő ablak"
-
-#, fuzzy
-#~ msgid "Error - Invalid Button"
-#~ msgstr "Hiba információ"
-
-#, fuzzy
-#~ msgid "Unknown Data"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "Enlightenment Starting. Please wait."
-#~ msgstr "Az Enlightenment indul. Kérlek várj..."
-
-#~ msgid "Enlightenment Battery Module"
-#~ msgstr "Teleptöltöttség-mérõ modul"
-
-#~ msgid ""
-#~ "A basic battery meter that uses either<hilight>ACPI</hilight> or "
-#~ "<hilight>APM</hilight><br>on Linux to monitor your battery and AC power "
-#~ "adaptor<br>status. This will work under Linux and FreeBSD and is "
-#~ "only<br>as accurate as your BIOS or kernel drivers."
-#~ msgstr ""
-#~ "Egyszerû teleptöltöttség-mérõ, ami az <hilight>ACPI</hilight> vagy "
-#~ "<hilight>APM</hilight><br>interfészeket használja Linux alatt, hogy "
-#~ "megállapítsa<br>a telep állapotát. FreeBSD-n és Linuxon mûködik.<br>Csak "
-#~ "annyira megbízható, mint a BIOS-od, vagy a kernel meghajtói."
-
-#~ msgid "Enlightenment Clock Module"
-#~ msgstr "Óra modul"
-
-#~ msgid "A simple module to give E17 a clock."
-#~ msgstr "Egyszerû modul, hogy az Enlightenmentnek is legyen órája"
-
-#, fuzzy
-#~ msgid "Enlightenment Conf Module"
-#~ msgstr "Óra modul"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Applications"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for applications."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Borders"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for borders."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Client List Menu"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for client list menu."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Colors"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for colors."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Desk"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for desk."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Lock"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen lock."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Virtual Desktops"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for virtual desktops."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Dialogs"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for dialogs."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Resolution"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen resolution."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Power Management"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for power management."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Engine"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for engine."
-#~ msgstr "Beállítás"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Run Command"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for run command."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Fonts"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for fonts."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Icon Theme"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for icon theme."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Input Methods"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for input methods."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Language"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for language and locale."
-#~ msgstr "Beállítás"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Key Bindings"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for key bindings."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Menu Settings"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for menus settings."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - File Icons"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for file icons."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Bindings"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse bindings."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Cursor"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse cursor."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Acceleration"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse acceleration."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Search Directories"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for search directories."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Performance"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for performance."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Profiles"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for config profiles."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Saver"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen saver."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Shelves"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for shelves."
-#~ msgstr "Beállítás"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Startup"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for startup."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Theme"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for theme."
-#~ msgstr "Beállítás"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Transitions"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Wallpaper"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Display"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window display."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Focus"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window focus."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Manipulation"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window manipulation."
-#~ msgstr "Konfigurációs ablakok"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window List"
-#~ msgstr "Az Enlightenment beállítása"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window list."
-#~ msgstr "Konfigurációs ablakok"
-
-#~ msgid "CPU Frequency Controller Module"
-#~ msgstr "CPU Sebességszabályzó modul"
+msgstr "Nyelv választása"
 
 #~ msgid ""
-#~ "A simple module to control the frequency of the system CPU.<br>This is "
-#~ "especially useful to save power on laptops."
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
 #~ msgstr ""
-#~ "Egyszerû modul a processzor sebességének állítására.<br>Rendkívül hasznos "
-#~ "hordozható gépeken az<br>energiafelhasználás csökkentésére"
+#~ "Az akkumulátor kezd lemerülni.<br>Esetleg csatlakoztathatnád egy "
+#~ "áramforráshoz.<br>"
 
-#~ msgid "Enlightenment Dropshadow Module"
-#~ msgstr "Árnyékoló modul"
+#~ msgid "BAD DRIVER"
+#~ msgstr "ROSSZ MEGHAJTÓ"
 
-#~ msgid ""
-#~ "This is the dropshadow module that allows dropshadows to be cast<br>on "
-#~ "the desktop background - without special X-Server extensions<br>or "
-#~ "hardware acceleration."
-#~ msgstr ""
-#~ "Árnyékoló modul, ami lehetõvé teszi az ablakok árnyékolását<br>különleges "
-#~ "X kiterjesztések -vagy hardveres gyorsítás- nélkül."
+#~ msgid "FULL"
+#~ msgstr "TELE"
 
-#, fuzzy
-#~ msgid "Enlightenment Exebuf Module"
-#~ msgstr "IBox modul"
-
-#, fuzzy
-#~ msgid "Enlightenment File Manager"
-#~ msgstr "Enlightenment %s modul"
-
-#, fuzzy
-#~ msgid "Enlightenment Winlist Module"
-#~ msgstr "Enlightenment %s modul"
-
-#~ msgid "Enlightenment IBar Module"
-#~ msgstr "IBar modul"
-
-#~ msgid ""
-#~ "This is the IBar Application Launcher bar module for Enlightenment.<br>It "
-#~ "is a first example module and is being used to flesh out "
-#~ "several<br>interfaces in Enlightenment 0.17.0. It is under heavy "
-#~ "development,<br>so expect it to <hilight>break often</hilight> and change "
-#~ "as it improves."
-#~ msgstr ""
-#~ "Ez az IBar alkalmazásindító modul. Ez az elsõ modul az E17-hez,<br>és "
-#~ "aktív fejlesztés alatt áll, így <highlight>gyakran \"elszállhat\"</"
-#~ "highlight>."
+#~ msgid "High"
+#~ msgstr "Magas"
 
-#~ msgid "Enlightenment IBox Module"
-#~ msgstr "IBox modul"
-
-#~ msgid ""
-#~ "This is the IBox Iconified Application module for Enlightenment.<br>It "
-#~ "will hold minimized applications"
-#~ msgstr "IBox ikonizált alkalmazásokat tároló modul."
-
-#, fuzzy
-#~ msgid "Enlightenment Layout Module"
-#~ msgstr "Start modul"
-
-#~ msgid "Enlightenment Pager Module"
-#~ msgstr "Lapozó modul"
-
-#~ msgid "A pager module to navigate virtual desktops."
-#~ msgstr "Lapozõ modul, virtuális asztalok kezelésére."
-
-#~ msgid "Enlightenment Start Module"
-#~ msgstr "Start modul"
-
-#~ msgid "Experimental Button module for E17"
-#~ msgstr "Start gomb az Enlightenmenthez"
-
-#~ msgid "Enlightenment Temperature Module"
-#~ msgstr "Hõmérsékletmérõ modul"
-
-#~ msgid ""
-#~ "A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux."
-#~ "<br>It is especially useful for modern Laptops with high speed<br>CPUs "
-#~ "that generate a lot of heat."
-#~ msgstr ""
-#~ "Egy module, ami az ACPI hõmérséklet-érzékelõ eredményeit közli "
-#~ "Linuxon<br>Hasznos újabb hordozható gépek esetén, amik nagy "
-#~ "sebességû<br>processzorral rendelkeznek és sok hõt termelnek."
-
-#, fuzzy
-#~ msgid "Enlightenment First Run Wizard Module"
-#~ msgstr "Start modul"
-
-#~ msgid "Enlightenment cannot set up its window list system."
-#~ msgstr "Az e17 nem tudta elindítani az ablaklista rendszert."
-
-#~ msgid "Enlightenment cannot set up its exebuf system."
-#~ msgstr "Az e17 nem tudta elindítani a exebuf rendszert."
-
-#, fuzzy
-#~ msgid "Application Menus"
-#~ msgstr "Alkalmazás"
-
-#~ msgid "Module State"
-#~ msgstr "Modul állapot"
-
-#~ msgid "Module Actions"
-#~ msgstr "Modul mûveletek"
-
-#, fuzzy
-#~ msgid "Widget"
-#~ msgstr "Szélesség"
-
-#, fuzzy
-#~ msgid "Module"
-#~ msgstr "Modulok"
-
-#~ msgid "Move Up"
-#~ msgstr "Fel"
-
-#, fuzzy
-#~ msgid "Favorites"
-#~ msgstr "Kedvencek menü megjelenítése"
-
-#~ msgid "Window Frame"
-#~ msgstr "Ablak keret"
-
-#~ msgid "Window"
-#~ msgstr "Ablak"
-
-#~ msgid "Window Name"
-#~ msgstr "Ablak neve"
-
-#~ msgid "Window Title"
-#~ msgstr "Ablak címe"
-
-#~ msgid "Icon Class"
-#~ msgstr "Ikon osztály"
-
-#~ msgid "Misc"
-#~ msgstr "Más"
-
-#~ msgid "Wait Exit"
-#~ msgstr "Várjon a kilépésre"
-
-#~ msgid "Error"
-#~ msgstr "Hiba"
-
-#, fuzzy
-#~ msgid "Could not create directory:<br><hilight>%s</hilight>"
-#~ msgstr "Nem tudtam törölni a <br><b>%s</b> fájlt!"
-
-#~ msgid "Screen zone"
-#~ msgstr "Képernyõterület"
-
-#, fuzzy
-#~ msgid "Terminal Command"
-#~ msgstr "Parancs futtatása"
-
-#, fuzzy
-#~ msgid "Font Size:"
-#~ msgstr "Ikon méret"
-
-#~ msgid "%2.1f pixels"
-#~ msgstr "%2.1f pixel"
-
-#~ msgid "Font Class Configuration"
-#~ msgstr "Egyedi betûk"
-
-#~ msgid "Font"
-#~ msgstr "Betûtípus"
-
-#, fuzzy
-#~ msgid "Edit Application"
-#~ msgstr "Alkalmazás"
-
-#, fuzzy
-#~ msgid "Available Applications"
-#~ msgstr "Kedvencek"
-
-#, fuzzy
-#~ msgid "Create a new Application"
-#~ msgstr "Kedvencek"
-
-#, fuzzy
-#~ msgid "Show windows from all zones"
-#~ msgstr "Minden ablak, minden virtuális asztalról"
-
-#, fuzzy
-#~ msgid "Buttons Settings"
-#~ msgstr "Betûtípus beállítások"
-
-#, fuzzy
-#~ msgid "Wheel callback"
-#~ msgstr "Háttér betûtípusok engedélyezése"
-
-#, fuzzy
-#~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
-#~ msgstr ""
-#~ "Az Enlightenment képtelen volt új folyamatot elágaztatni:<br><br>%s<br>"
-
-#, fuzzy
-#~ msgid "Enlightenment was unable to fork a child process:<br><br>%s %s<br>"
-#~ msgstr ""
-#~ "Az Enlightenment képtelen volt új folyamatot elágaztatni:<br><br>%s<br>"
-
-#, fuzzy
-#~ msgid "Applications Menu"
-#~ msgstr "Alkalmazás"
-
-#~ msgid "Enlightenment cannot set up its app system."
-#~ msgstr "Az e17 nem tudta felállítani a app-rendszert."
-
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Adatok"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Vegyes"
-
-#~ msgid "Window list skip"
-#~ msgstr "Kihagyás az ablaklistából"
-
-#~ msgid "Desktop Settings"
-#~ msgstr "Az asztal beállításai"
-
-#, fuzzy
-#~ msgid "Desktop Flip"
-#~ msgstr "Asztalváltás egérrel"
-
-#~ msgid "Stop editing"
-#~ msgstr "Szerkesztés vége"
-
-#, fuzzy
-#~ msgid "Could not delete <br><hilight>%s</hilight>"
-#~ msgstr "Nem tudtam törölni a <br><b>%s</b> fájlt!"
-
-#, fuzzy
-#~ msgid "Programming"
-#~ msgstr "Tükrözés"
-
-#, fuzzy
-#~ msgid "Games"
-#~ msgstr "Név szerint"
-
-#, fuzzy
-#~ msgid "Editors"
-#~ msgstr "Eap szerkesztõ"
-
-#, fuzzy
-#~ msgid "Add Mouse"
-#~ msgstr "Haladó"
-
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Ikonizáld"
-
-#, fuzzy
-#~ msgid "Regenerate or update your Applications menu?"
-#~ msgstr "Kedvencek"
-
-#, fuzzy
-#~ msgid "Regenerate"
-#~ msgstr "Lassuló"
-
-#, fuzzy
-#~ msgid "Regenerate / Update \"Applications\" Menu"
-#~ msgstr "Kedvencek"
-
-#~ msgid "Temp 1"
-#~ msgstr "Temp 1"
-
-#~ msgid "Temp 2"
-#~ msgstr "Temp 2"
-
-#~ msgid "Temp 3"
-#~ msgstr "Temp 3"
-
-#, fuzzy
-#~ msgid "ACPI Temperature"
-#~ msgstr "Hõmérséklet"
-
-#~ msgid "Behavior"
-#~ msgstr "Viselkedés"
-
-#, fuzzy
-#~ msgid "Add application..."
-#~ msgstr "Alkalmazás"
-
-#, fuzzy
-#~ msgid "Move application up"
-#~ msgstr "(Nincs alkalmazás)"
-
-#, fuzzy
-#~ msgid "Move application down"
-#~ msgstr "(Nincs alkalmazás)"
-
-#~ msgid "Cannot add icon"
-#~ msgstr "Nemtudtam hozzáadni az ikont"
-
-#~ msgid ""
-#~ "You tried to drop an icon of an application that<br>does not have a "
-#~ "matching application file.<br><br>The icon cannot be added to IBar."
-#~ msgstr ""
-#~ "Egy olyan ikon dobtál az IBarra, aminek nincs<br>futtatható állománya."
-#~ "<br><br>Nem adtam hozzá ikont az IBarhoz!"
-
-#~ msgid "ITray Configuration"
-#~ msgstr "ITray tulajdonságok"
-
-#~ msgid "Number of Rows"
-#~ msgstr "Sorok száma"
-
-#~ msgid "%3.0f"
-#~ msgstr "%3.0f"
-
-#~ msgid "Enlightenment ITray Module"
-#~ msgstr "ITray modul"
-
-#~ msgid ""
-#~ "This is the ITray system tray module for Enlightenment.<br>It will hold "
-#~ "system tray icons.<br>Beware that this can be buggy due to many systray "
-#~ "providing<br>applications not handling the protocol properly, and the "
-#~ "way<br>systray icons work being very limiting and hacky. Do not "
-#~ "use<br>this module unless you absolutely must, and if you do, "
-#~ "beware<br>of issues that will appear."
-#~ msgstr ""
-#~ "Ez az ITray modul az Enlightenmenthez.<br>A rendszer-tálca ikonok helye."
-#~ "<br>Vigyázz, mert sok hiba lehet benne a sok rendszer-tálcát "
-#~ "használó<br>alkalmazás miatt, amik nem kezelik rendesen ezt a protokollt."
-#~ "<br>Ne használd ezt a modult, ha csak nincs rá feltétlen szükséged.<br>"
-
-#~ msgid "To Desktop 0"
-#~ msgstr "0 asztalra"
-
-#~ msgid "To Desktop 1"
-#~ msgstr "1 asztalra"
-
-#~ msgid "To Desktop 2"
-#~ msgstr "2 asztalra"
-
-#~ msgid "To Desktop 3"
-#~ msgstr "3 asztalra"
-
-#~ msgid "To Desktop 4"
-#~ msgstr "4 asztalra"
-
-#~ msgid "To Desktop 5"
-#~ msgstr "5 asztalra"
-
-#~ msgid "To Desktop 6"
-#~ msgstr "6 asztalra"
-
-#~ msgid "To Desktop 7"
-#~ msgstr "7 asztalra"
-
-#~ msgid "To Desktop 8"
-#~ msgstr "8 asztalra"
-
-#~ msgid "To Desktop 9"
-#~ msgstr "9 asztalra"
-
-#~ msgid "To Desktop 10"
-#~ msgstr "10 asztalra"
-
-#~ msgid "To Desktop 11"
-#~ msgstr "11 asztalra"
-
-#~ msgid "Toggle Edit Mode"
-#~ msgstr "Kütyük rendezése"
-
-#~ msgid "App name"
-#~ msgstr "Név"
-
-#~ msgid "Path"
-#~ msgstr "Elérési út"
-
-#~ msgid "Enlightenment: Error!"
-#~ msgstr "Enlightenment: Hiba!"
-
-#~ msgid "Places"
-#~ msgstr "Helyek"
-
-#~ msgid "Home"
-#~ msgstr "Saját könyvtár"
-
-#~ msgid ""
-#~ "Enlightenment was unable to fork a child process:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Az Enlightenment képtelen volt új az folyamatot elágaztatni:\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "Protect this file"
-#~ msgstr "Védd ezt a fájlt!"
-
-#~ msgid "Let others see this file"
-#~ msgstr "A többiek is láthatják ezt a fájlt"
-
-#~ msgid "Let others modify this file"
-#~ msgstr "A többiek is módosíthatják ezt a fájlt"
-
-#~ msgid "Dont let others see or modify this file"
-#~ msgstr "A többiek nem láthatják vagy módosíthatják ezt a fájlt"
-
-#~ msgid "Custom settings"
-#~ msgstr "Egyéni beállítások"
-
-#~ msgid "Last Access:"
-#~ msgstr "Utolsó hozzáférés:"
-
-#~ msgid "Me"
-#~ msgstr "Én"
-
-#~ msgid "r"
-#~ msgstr "Olvas"
-
-#~ msgid "w"
-#~ msgstr "Ír"
-
-#~ msgid "x"
-#~ msgstr "Futtat"
-
-#~ msgid "My Group"
-#~ msgstr "Csoportom"
-
-#~ msgid "Everyone"
-#~ msgstr "Mindenki"
-
-#~ msgid "By Mod Time"
-#~ msgstr "Módosítás szerint"
-
-#~ msgid "View"
-#~ msgstr "Nézet"
-
-#~ msgid "Begin editing"
-#~ msgstr "Szerkesztés"
-
-#~ msgid "Automatic Width"
-#~ msgstr "Automatikus szélesség"
-
-#~ msgid "Half Screen Width"
-#~ msgstr "Fél képernyõnyi szélesség"
-
-#~ msgid "Full Screen Width"
-#~ msgstr "Teljes képernyõnyi szélesség"
-
-#~ msgid "Center Horizontally"
-#~ msgstr "Vízszintesen középre"
-
-#~ msgid "Automatic Height"
-#~ msgstr "Automatikus magasság"
-
-#~ msgid "Half Screen Height"
-#~ msgstr "Fél képernyõnyi magasság"
-
-#~ msgid "Full Screen Height"
-#~ msgstr "Teljes képernyõnyi magasság"
-
-#~ msgid "Center Vertically"
-#~ msgstr "Fuggõlegesen középre"
-
-#~ msgid "Allow Overlap"
-#~ msgstr "Átfedés engedélyezése"
-
-#~ msgid "End Edit Mode"
-#~ msgstr "Kütyük rendezésének befejezése"
-
-#~ msgid "Maximized"
-#~ msgstr "Teljes méretû"
-
-#~ msgid "Background Settings"
-#~ msgstr "Háttérképek"
-
-#~ msgid "Theme Background"
-#~ msgstr "Téma háttére"
-
-#~ msgid "Import An Image"
-#~ msgstr "Kép importálása"
-
-#~ msgid "Center Image"
-#~ msgstr "Középre"
-
-#~ msgid "Auto-Apply Configuration Changes"
-#~ msgstr "Változások automatikus alkalmazása"
-
-#~ msgid "Desktop Lock Settings"
-#~ msgstr "Az asztal zárolásának beállításai"
-
-#~ msgid "Password Type"
-#~ msgstr "Jelszó típusa"
-
-#~ msgid "Use my login password"
-#~ msgstr "Bejelentkezési jelszó használata"
-
-#~ msgid "Personalized password"
-#~ msgstr "Egyéni jelszó"
-
-#~ msgid "Show password"
-#~ msgstr "Jelszó megjelenítése"
-
-#~ msgid "Theme DeskLock Background"
-#~ msgstr "Téma DeskLock háttere"
-
-#~ msgid "To the left"
-#~ msgstr "Baloldalra"
-
-#~ msgid "Turned around"
-#~ msgstr "Megfordítva"
-
-#~ msgid "To the right"
-#~ msgstr "Jobboldalra"
-
-#~ msgid "Exebuf Settings"
-#~ msgstr "Exebuf beállítások"
-
-#~ msgid "Font Hinting Settings"
-#~ msgstr "Betûsimítási beállítások"
-
-#~ msgid "Bytecode Hinting"
-#~ msgstr "Bájtkód simítás"
-
-#~ msgid "Automatic Hinting"
-#~ msgstr "Automatikus simítás"
-
-#~ msgid "No Hinting"
-#~ msgstr "Nincs simítás"
-
-#~ msgid "Assign Key Binding..."
-#~ msgstr "Új billentyûkombináció"
-
-#~ msgid "Unsorted"
-#~ msgstr "Rendezetlen"
-
-#~ msgid ":"
-#~ msgstr ":"
-
-#~ msgid "Allow shading/resizing"
-#~ msgstr "Árnyékolás/átméretezés engedélyezése"
-
-#~ msgid "Restart Enlightenment"
-#~ msgstr "Enlightenment újraindítása"
-
-#~ msgid "Exit Enlightenment"
-#~ msgstr "Kilépés az Enlightenmentbõl"
-
-#~ msgid "(Unused)"
-#~ msgstr "(Nem használt)"
-
-#~ msgid ""
-#~ "Enlightenment cannot set up the IPC socket.\n"
-#~ "It likely is already in use by an existing copy of Enlightenment.\n"
-#~ "Double check to see if Enlightenment is not already on this display,\n"
-#~ "but if that fails try deleting all files in ~/.ecore/enlightenment-*\n"
-#~ "and try running again.\n"
-#~ "\n"
-#~ "If you use AFS then maybe you might want to make a symlink from\n"
-#~ "~/.ecore to /tmp/my_directory/ecore where sockets can be made."
-#~ msgstr ""
-#~ "Az e17 nem tudta felállítani az IPC socketet.\n"
-#~ "Valószínûleg már használja egy másik Enlightenment folyamat.\n"
-#~ "Kérlek ellenõrizd, hogy fut-e már egy Enlightenment ezen\n"
-#~ "a képernyõn. Ha ez nem megy, töröld a fájlokat a ~/.ecore/enlightenment-"
-#~ "*\n"
-#~ "alatt, és próbáld újra\n"
-#~ "\n"
-#~ "Ha AFS-t használsz, talán csinálhatnál egy szimlinket a ~/.ecore-tól\n"
-#~ "a /tmp/sajat_konyvtar/ecore könyvtár alá."
-
-#~ msgid "Enlightenment IPC setup error!"
-#~ msgstr "Englightenment IPC hiba!"
-
-#~ msgid ""
-#~ "Enlightenment cannot set up the IPC socket.\n"
-#~ "It likely is already in use by an existing copy of Enlightenment.\n"
-#~ "Double check to see if Enlightenment is not already on this display,\n"
-#~ "but if that fails try deleting all files in ~/.ecore/enlightenment-*\n"
-#~ "and try running again."
-#~ msgstr ""
-#~ "Az e17 nem tudta felállítani az IPC socketet.\n"
-#~ "Valószínûleg már használja egy másik Enlightenment folyamat.\n"
-#~ "Kérlek ellenõrizd, hogy nem fut-e már egy Enlightenment ezen\n"
-#~ "a képernyõn. Ha ez nem megy, töröld a fájlokat a ~/.ecore/enlightenment-"
-#~ "*\n"
-#~ "alatt, és próbáld újra."
-
-#~ msgid "About…"
-#~ msgstr "Adatok"
-
-#~ msgid "Left"
-#~ msgstr "Bal"
-
-#~ msgid "Right"
-#~ msgstr "Jobb"
-
-#~ msgid "Top"
-#~ msgstr "Felül"
-
-#~ msgid "Top Left"
-#~ msgstr "Felül-baloldalt"
-
-#~ msgid "Top Right"
-#~ msgstr "Felül-jobboldalt"
-
-#~ msgid "Bottom Right"
-#~ msgstr "Alul-jobboldalt"
-
-#~ msgid "Left Top"
-#~ msgstr "Baloldalt-felül"
-
-#~ msgid "Right Top"
-#~ msgstr "Jobboldalt-felül"
-
-#~ msgid "Left Bottom"
-#~ msgstr "Baloldalt-alul"
-
-#~ msgid "Right Bottom"
-#~ msgstr "Jobboldalt-Alul"
-
-#~ msgid "Contents Settings"
-#~ msgstr "Tartalom beállítása"
-
-#~ msgid "Status"
-#~ msgstr "Állapot"
-
-#~ msgid "Follower"
-#~ msgstr "Követõ"
-
-#~ msgid "Visible"
-#~ msgstr "Látható"
-
-#~ msgid "Follow Speed"
-#~ msgstr "Követési sebesség"
-
-#~ msgid "%1.2f px/s"
-#~ msgstr "%1.2f pixel/mp"
+#~ msgid "Low"
+#~ msgstr "Alacsony"
 
-#~ msgid "Auto Fit"
-#~ msgstr "Automatikus illeszkedés"
+#~ msgid "Danger"
+#~ msgstr "Veszély"
 
-#~ msgid "Autoscroll Speed:"
-#~ msgstr "Autoscroll sebessége:"
+#~ msgid "Charging"
+#~ msgstr "Töltés"
diff --git a/po/it.gmo b/po/it.gmo
index e8cf7a1..81dd168 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 7125d96..c51c005 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2008-01-06 10:35+0100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-05-12 19:54+0200\n"
 "Last-Translator: Massimo Maiurana <maiurana at gmail.com>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Informazioni su Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -66,15 +66,15 @@ msgstr "Siete sicuri di voler uccidere questa finestra?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Sì"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "No"
 
@@ -141,334 +141,314 @@ msgid ""
 msgstr ""
 "Avete chiesto di ibernare il computer.<br><br>Siete sicuri di volerlo fare?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Finestre : Azioni"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Sposta"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menù"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menù finestra"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Eleva"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Abbassa"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Uccidi"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Finestre : Stato"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Commuta stato appiccicata"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Commuta stato iconificata"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Commuta stato a tutto schermo"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Massimizza a tutto schermo"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo massimizzazione intelligente"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo massimizzazione espansivo"
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo massimizzazione riempitivo"
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Commuta contrazione verso l'alto"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Commuta contrazione verso il basso"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Commuta contrazione verso sinistra"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Commuta contrazione verso destra"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Commuta contrazione"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Commuta stato senza bordo"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Commuta stato attaccata"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Cambia desktop verso sinistra"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Cambia desktop verso destra"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Cambia desktop verso l'alto"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Cambia desktop verso il basso"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Cambia desktop di..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Mostra il desktop"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Cambia desktop a..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Cambia desktop linearmente..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Passa al desktop 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Passa al desktop 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Passa al desktop 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Passa al desktop 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Passa al desktop 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Passa al desktop 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Passa al desktop 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Passa al desktop 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Passa al desktop 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Passa al desktop 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Passa al desktop 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Passa al desktop 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Passa al desktop..."
 
-#: src/bin/e_actions.c:2156
-#, fuzzy
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Cambia desktop verso sinistra"
+msgstr "Cambia desktop verso sinistra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2158
-#, fuzzy
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Cambia desktop verso destra"
+msgstr "Cambia desktop verso destra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2160
-#, fuzzy
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Cambia desktop verso l'alto"
+msgstr "Cambia desktop verso l'alto (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2162
-#, fuzzy
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Cambia desktop verso il basso"
+msgstr "Cambia desktop verso il basso (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2164
-#, fuzzy
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Cambia desktop di..."
+msgstr "Cambia desktop di...  (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2170
-#, fuzzy
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Cambia desktop a..."
+msgstr "Cambia desktop a... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2176
-#, fuzzy
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Cambia desktop linearmente..."
+msgstr "Cambia desktop linearmente... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2182
-#, fuzzy
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Passa al desktop 0"
+msgstr "Passa al desktop 0 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2184
-#, fuzzy
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Passa al desktop 1"
+msgstr "Passa al desktop 1 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2186
-#, fuzzy
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Passa al desktop 2"
+msgstr "Passa al desktop 2 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2188
-#, fuzzy
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Passa al desktop 3"
+msgstr "Passa al desktop 3 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2190
-#, fuzzy
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Passa al desktop 4"
+msgstr "Passa al desktop 4 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2192
-#, fuzzy
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Passa al desktop 5"
+msgstr "Passa al desktop 5 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2194
-#, fuzzy
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Passa al desktop 6"
+msgstr "Passa al desktop 6 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2196
-#, fuzzy
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Passa al desktop 7"
+msgstr "Passa al desktop 7 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2198
-#, fuzzy
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Passa al desktop 8"
+msgstr "Passa al desktop 8 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2200
-#, fuzzy
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Passa al desktop 9"
+msgstr "Passa al desktop 9 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2202
-#, fuzzy
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Passa al desktop 10"
+msgstr "Passa al desktop 10 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2204
-#, fuzzy
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Passa al desktop 11"
+msgstr "Passa al desktop 11 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2206
-#, fuzzy
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Passa al desktop..."
+msgstr "Passa al desktop... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -478,136 +458,136 @@ msgstr "Passa al desktop..."
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Invia mouse allo schermo 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Invia mouse allo schermo 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Invia mouse allo schermo..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Invia mouse avanti di 1 schermo"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Invia mouse indietro di 1 schermo"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Invia mouse avanti/indietro di schermi..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Finestre : Spostamento"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Al desktop successivo"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Al desktop precedente"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Di # desktop..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Al desktop..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Mostra menù principale"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Mostra menù preferiti"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Mostra menù applicazioni"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Mostra menù dei client"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Mostra menù..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Esecuzione"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Comando definito"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Applicazione"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Chiudi sessione"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Esci immediatamente"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Arresta"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Sospendi su disco"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Bloccaschermo"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Ordina Finestre"
 
@@ -615,11 +595,11 @@ msgstr "Ordina Finestre"
 msgid "Set As Background"
 msgstr "Imposta come sfondo"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "Scansione file desktop eseguita"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Scansione file desktop"
 
@@ -663,11 +643,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Desktop %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Aggiornamento configurazione"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -679,7 +659,7 @@ msgstr ""
 "dove è avvenuto l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -695,7 +675,7 @@ msgstr ""
 "avvenuto l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -709,7 +689,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -723,7 +703,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -735,17 +715,16 @@ msgstr ""
 "avvenuto l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problemi scrittura configurazione di Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -754,19 +733,20 @@ msgstr "Problemi scrittura configurazione di Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avanzate"
 
@@ -782,14 +762,14 @@ msgstr "Applica"
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Moduli"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Contenitore %d"
@@ -861,7 +841,7 @@ msgid "Desktop Entry Editor"
 msgstr "Editor file desktop"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icona"
@@ -897,7 +877,7 @@ msgstr "Descrizione"
 msgid "Window Class"
 msgstr "Classe"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Categorie"
@@ -942,6 +922,7 @@ msgstr "Seleziona un'icona"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -949,7 +930,7 @@ msgstr "Annulla"
 msgid "Select an Executable"
 msgstr "Seleziona un'eseguibile"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -957,15 +938,15 @@ msgstr "Seleziona un'eseguibile"
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Copia"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Incolla"
 
@@ -973,13 +954,13 @@ msgstr "Incolla"
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Errore di esecuzione"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
@@ -987,11 +968,11 @@ 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1000,193 +981,193 @@ msgstr ""
 "Enlightenment non ha potuto avviare l'applicazione:<br><br>%"
 "s<br><br>L'applicazione non è partita"
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "L'esecuzione di %s è terminata inaspettatamente"
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Un codice d'uscita %i è stato restituito da %s"
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s è stato fermato da un segnale d'interruzione"
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s è stato fermato da un segnale di uscita"
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s è stato fermato da un segnale di aborto"
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, 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:444
+#: src/bin/e_exec.c:449
 #, 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:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s è stato fermato da un errore di segmentazione"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s è stato fermato da una pipe rotta"
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s è stato fermato da un segnale di terminazione"
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s è stato fermato da un errore del bus"
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s è stato fermato dal segnale numero %i"
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Log di errore"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Non ci sono messaggi d'errore."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Salva questo messaggio"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Informazioni sull'errore"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Informazioni sui segnali d'errore"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Dati dell'output"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Non ci sono output."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr "Percorso inesistente"
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
-msgstr "%s non esiste"
+msgid "%s doesn't exist."
+msgstr "%s non esiste."
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i File"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Modalità visualizzazione"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Aggiorna vista"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Ricorda ordinamento"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Ordina adesso"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Nuova directory"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Icone"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Elenco"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Crea nuova directory"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nome directory:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Rinomina %s in:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Rinomina file"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Conferma eliminazione"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1240,7 +1221,7 @@ msgid "Owner can write"
 msgstr "Proprietario può scrivere"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1273,49 +1254,49 @@ msgstr "Informazioni collegamento"
 msgid "Select an Image"
 msgstr "Seleziona un'immagine"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume sconosciuto"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Dispositivo rimovibile"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Liscio"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Incassato"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1329,27 +1310,27 @@ msgstr "Incassato"
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Scorri automaticamente contenuto"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Ridimensionabile"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Inizio spostamento/ridimensionamento di questo gadget"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Elimina questo gadget"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Fine spostamento/ridimensionamento di questo gadget"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1380,7 +1361,7 @@ msgstr ""
 "risponde ai segnali<br>quando l'avvio viene completato. Dovreste usare<br>un "
 "tema corretto per lo splash screen o sistemare<br>quello che state usando."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Blocchi finestre"
 
@@ -1414,21 +1395,21 @@ msgid "Lock program changing:"
 msgstr "Impedisci al programma di cambiarne:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Posizione"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Dimensione"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Livello"
 
@@ -1437,12 +1418,12 @@ msgid "Iconified state"
 msgstr "Stato di iconificata"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Stato di appiccicata"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Stato di contratta"
 
@@ -1458,7 +1439,7 @@ msgstr "Stato a tutto schermo"
 msgid "Lock me from changing:"
 msgstr "Impedisci all'utente di cambiarne:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Stile di bordo"
 
@@ -1478,126 +1459,126 @@ msgstr "Uscire dalla sessione con questa finestra aperta"
 msgid "Remember these Locks"
 msgstr "Ricorda questi blocchi"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Sempre sulle altre"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normale"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Sempre sotto le altre"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Dimensioni normali"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Ricorda"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Bordo"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Invia al desktop"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Attacca al desktop"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Stacca dal desktop"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Stato"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Salta"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Modifica icona"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Aggiungi al menù dei preferiti"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Aggiungi scorciatoia di tastiera"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Aggiungi alla barra"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Crea icona"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Proprietà della finestra"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Seleziona stile del bordo"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Usa preferenza predefinita per l'icona"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Usa icona fornita dall'applicazione"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Usa icona impostata dall'utente"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Contratta"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Appiccicata"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "A tutto schermo"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista finestre"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1606,6 +1587,10 @@ msgstr "Lista finestre"
 msgid "Pager"
 msgstr "Pager"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr "Taskbar"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1618,7 +1603,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Proprietà ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Titolo"
 
@@ -1714,11 +1699,11 @@ msgstr "Proprietà NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Salta Taskbar"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Salta Pager"
 
@@ -1726,15 +1711,15 @@ msgstr "Salta Pager"
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Ricorda finestra"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "La finestra non ha proprietà univoche"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1759,11 +1744,11 @@ msgstr ""
 "impostazioni saranno accettate. Nel dubbio<br>premere <hilight>Annulla</"
 "hilight> e nulla cambierà."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Nessuna corrispondenza impostata"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1775,7 +1760,7 @@ msgstr ""
 "finestra <hilight>senza specificare come farlo</hilight>.<br><br>Occorre "
 "specificare almeno un modo per ricordare questa finestra."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1805,118 +1790,118 @@ msgstr ""
 "<hilight>OK</hilight> e le impostazioni saranno accettate. Nel "
 "dubbio<br>premere <hilight>Annulla</hilight> e nulla cambierà."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nulla"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Dimensione e posizione"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Blocchi"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Dimensione, posizione e blocchi"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Tutto"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Ricorda per mezzo di:"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nome e classe"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Ruolo"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Tipo"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Transitorietà"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Proprietà da ricordare:"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Preferenza icona"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Desktop virtuale"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Schermo attuale"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Fuori lista finestre"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Ricorda solo una istanza"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Avvia questo programma al login"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr "Prendi sempre fuoco all'avvio"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "File manager"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "Shelf"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Gestione moduli"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Moduli disponibili"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Carica modulo"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Moduli caricati"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Scarica modulo"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1981,10 +1966,12 @@ msgstr "Applicazioni preferite"
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2010,52 +1997,52 @@ msgstr "Mensole portamoduli"
 msgid "Show/Hide All Windows"
 msgstr "Mostra/nascondi tutte le finestre"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Nessuna Applicazione)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configura desktop virtuali"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Blocca schermo"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Iberna"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Chiudi sessione"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Nessuna Finestra)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Finestre perse"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Nessun nome!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Nessuna mensola)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Mensola #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Aggiungi mensola"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Elimina mensola"
 
@@ -2064,13 +2051,13 @@ msgid "Shelf Configuration"
 msgstr "Configurazione mensola portamoduli"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Piccolissima"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Piccolo"
 
@@ -2079,12 +2066,12 @@ msgid "Medium"
 msgstr "Media"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandissima"
 
@@ -2122,7 +2109,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Stili"
 
@@ -2673,16 +2660,14 @@ msgstr ""
 "sistema di ordinamento file."
 
 #: src/bin/e_main.c:865
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "Imposta regole energia CPU"
+msgstr "Imposta modi risparmio energetico"
 
 #: src/bin/e_main.c:869
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
-"sistema di popup."
+"sistema di modi risparmio energetico."
 
 #: src/bin/e_main.c:901
 msgid "Load Modules"
@@ -2726,7 +2711,7 @@ msgstr "Configura mensole portamoduli"
 msgid "Almost Done"
 msgstr "Quasi fatto"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2735,11 +2720,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Errore nel caricamento del modulo"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2748,11 +2733,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Il modulo non contiene tutte le funzioni necessarie"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2763,12 +2748,12 @@ 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:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Modulo %s di Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Volete disattivare questo modulo?<br>"
 
@@ -3071,9 +3056,9 @@ msgstr "Aggiungi ai preferiti"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Directory superiore"
 
@@ -3110,39 +3095,39 @@ msgstr "Proibito"
 msgid "Read-Write"
 msgstr "Lettura-scrittura"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configurazione modulo Battery"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Impostazioni di base"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Allarme se il livello batteria è basso"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Impostazioni avanzate"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Controlla batteria ogni:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
-#, fuzzy, c-format
+#: src/modules/temperature/e_mod_config.c:380
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f file"
+msgstr "%1.0f tick"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Allarme se l'autonomia della batteria è:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3153,71 +3138,51 @@ msgstr "Allarme se l'autonomia della batteria è:"
 msgid "%1.0f minutes"
 msgstr "%1.0f minuti"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f percento"
 
-#: src/modules/battery/e_mod_main.c:137
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
+msgstr "Rimuovi allarme automaticamente"
+
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
+msgstr "Rimuovi allarme dopo:"
+
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f secondi"
+
+#: src/modules/battery/e_mod_main.c:129
 msgid "Battery"
 msgstr "Battery"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Batteria esaurita<br>La vostra batteria si sta esaurendo.<br>Vogliate "
-"passare ad una alimentazione di rete."
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Indicatore di carica"
 
-#: src/modules/battery/e_mod_main.c:355
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
 msgid "ERROR"
-msgstr ""
+msgstr "ERRORE"
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
+#: src/modules/battery/e_mod_main.c:563
 msgid "N/A"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "DRIVER SBAGLIATO"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "CARICA"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Alta"
+msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Bassa"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Pericolo"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "In carica"
-
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
-msgstr "Indicatore di carica"
-
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Clock"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configurazione di Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Oggetti"
 
@@ -3248,7 +3213,7 @@ msgid "Restart Applications"
 msgstr "Applicazioni per il riavvio"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Tutte le applicazioni"
 
@@ -3305,7 +3270,7 @@ msgstr "Criterio di raggruppamento"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3407,7 +3372,7 @@ msgid "Error Text"
 msgstr "Testo di errore"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Titolo menù"
 
@@ -3416,7 +3381,7 @@ msgid "Menu Title Active"
 msgstr "Titolo menù attivo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Voce di menù"
 
@@ -3425,12 +3390,12 @@ msgid "Menu Item Active"
 msgstr "Voce menù attiva"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Testo spostamento"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Testo ridimensionamento"
 
@@ -3443,12 +3408,12 @@ msgid "Winlist Label"
 msgstr "Etichetta lista finestre"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Titolo lista finestre"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Widget"
 
@@ -3485,7 +3450,7 @@ msgid "List Item Odd Text"
 msgstr "Testo singolare casella di testo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Intestazione casella combinata"
 
@@ -3571,6 +3536,7 @@ msgstr "Nome desktop"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nome:"
 
@@ -3612,10 +3578,10 @@ msgstr "Tempo massimo per bloccaschermo"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Personali"
 
@@ -3952,11 +3918,11 @@ msgstr "Abilita estensioni \"Composite\""
 msgid "Default Engine"
 msgstr "Motore predefinito"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr "Abilitare estensioni \"Composite\"?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4083,192 +4049,196 @@ msgstr "Allineamento all'asse Y"
 msgid "Run Command"
 msgstr "Lanciacomandi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Nucleo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Barra del titolo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Textblock"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Textblock leggero"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Textblock grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Intestazioni configurazione"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Titolo \"Informazioni su...\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Versione \"Informazioni su...\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Testo \"Informazioni su...\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Titolo bloccaschermo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Password bloccaschermo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Finestra d'errore"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Lanciacomandi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Titolo splash screen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Testo splash screen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Versione splash screen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Voce"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Cornice"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Etichetta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Bottone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Cursore"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Casella di opzione"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Casella di spunta"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Casella di testo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Voce casella combinata"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "File manager"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Casella immissione testo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+msgid "Desktop Icon"
+msgstr "Icona desktop"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Piccolo stilizzato"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Normale stilizzato"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Grande stilizzato"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Impostazioni dei font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Molto grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Abilita classi font personalizzate"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Testo anteprima di base: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Configurazione classi font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Abilita classe font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Hinting (ottimizzazione)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Font alternativi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Nome font alternativo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Abilita font alternativi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Testo anteprima avanzato.. 我真的会写中文"
 
@@ -4307,7 +4277,7 @@ msgid "New"
 msgstr "Nuovo"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importa..."
 
@@ -4359,22 +4329,62 @@ msgstr "Lingua"
 msgid "Input Method Settings"
 msgstr "Metodo di input"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+msgid "Interaction Settings"
+msgstr "Impostazioni interazione"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr "Abilita trascinamento con dita"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr "Soglia per trascinamento"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixel"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr "Soglia per moto residuo"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%1.0f pixel/sec"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr "Rallentamento frizione"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, c-format
+msgid "%1.2f sec"
+msgstr "%1.2f sec"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+msgid "Interaction"
+msgstr "Interazione"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configurazione lingua"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Selettore lingua"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Localizzazione selezionata"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Localizzazione"
 
@@ -4693,11 +4703,6 @@ msgstr "Usa puntatore di X"
 msgid "Cursor Size"
 msgstr "Dimensione del puntatore"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixel"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Puntatore del mouse"
@@ -4732,7 +4737,7 @@ msgid "Images"
 msgstr "Immagini"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Temi"
 
@@ -4891,11 +4896,6 @@ msgstr "Tempo per l'avvio dello screensaver"
 msgid "Time until X screensaver alternates"
 msgstr "Tempo per il cambio dello screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondi"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Oscuramento"
@@ -4954,23 +4954,23 @@ msgstr "Mostra splash screen al login"
 msgid "Startup"
 msgstr "Avvio"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Selettore temi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Categorie dei temi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Assegna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Pulisci tutto"
 
@@ -5018,38 +5018,43 @@ msgstr "Cambio sfondo"
 msgid "Transitions"
 msgstr "Transizioni"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Impostazioni sfondo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Usa sfondo del tema"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Immagine..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Gradiente..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr "Online..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Posizionamento dello sfondo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Tutti i desktop"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Questo desktop"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Questo schermo"
 
@@ -5099,7 +5104,7 @@ msgstr "Errore creazione gradiente"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Per qualche ragione Enlightenment non ha potuto creare il gradiente."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Selezionare un'immmagine..."
 
@@ -5151,19 +5156,19 @@ msgstr ""
 "Enlightenment non ha potuto importare l'immagine<br>a causa di errori di "
 "conversione."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Errore importazione sfondo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5171,6 +5176,63 @@ msgstr ""
 "Enlightenment non ha potuto importare lo sfondo.<br>Siete sicuri che sia uno "
 "sfondo valido?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr "Scegliere un sito dalla lista..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr "get-e.org - Statici"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr "get-e.org - Animati"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr "[%s] Ricezione feed... FATTO!"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr "[%s] Ricezione feed... FALLITO!"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr "[%s] Elaborazione feed... FATTO!"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr "[%s] Elaborazione feed... FALLITO!"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr "[%s] Scaricamento file edje..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr "[%s] Scaricamento %d immagini di %d"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr "[%s] Scegliere un'immagine dalla lista"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr "[%s] Scaricamento file edje... %d%% fatto"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr "[%s] Ricezione feed..."
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5460,6 +5522,60 @@ msgstr "Consenti manipolazione finestre"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Sposta/ridimensiona finestre alla scomparsa della mensola"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr "Impostazioni finestra da ricordare"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+msgid "Delete Remember(s)"
+msgstr "Elimina impostazioni da ricordare"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Predefiniti"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nessun nome!!"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Titolo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Titolo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Ruolo"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Nessuna>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Commutatore finestre (alt+tab)"
@@ -5533,29 +5649,24 @@ msgid "Cpufreq"
 msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:177
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Veloce (0.5 sec)"
+msgstr "Veloce (4 tick)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Medio (1 sec)"
+msgstr "Medio (8 tick)"
 
 #: src/modules/cpufreq/e_mod_main.c:191
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normale (2 sec)"
+msgstr "Normale (32 tick)"
 
 #: src/modules/cpufreq/e_mod_main.c:198
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Lento (5 sec)"
+msgstr "Lento (64 tick)"
 
 #: src/modules/cpufreq/e_mod_main.c:205
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Molto lento (30 sec)"
+msgstr "Molto lento (256 tick)"
 
 #: src/modules/cpufreq/e_mod_main.c:220
 msgid "Manual"
@@ -5822,19 +5933,19 @@ msgstr "Mostra barra strumenti"
 msgid "Go to Parent Directory"
 msgstr "Directory superiore"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Apri"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Apri con..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Applicazioni specifiche"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr "Comando personalizzato"
 
@@ -5949,9 +6060,8 @@ msgid "Display Icon Name"
 msgstr "Mostra nome icona"
 
 #: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Visualizza informazioni"
+msgstr "Visualizza didascalia del bordo"
 
 #: src/modules/ibox/e_mod_config.c:130
 msgid "Show windows from all screens"
@@ -5982,9 +6092,8 @@ msgid "Flip desktop on mouse wheel"
 msgstr "Cambia desktop con la rotella del mouse"
 
 #: src/modules/pager/e_mod_config.c:119 src/modules/pager/e_mod_config.c:158
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Mostra icone sul desktop"
+msgstr "Mostra nomi dei desktop"
 
 #: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:198
 msgid "Popup Settings"
@@ -6019,7 +6128,7 @@ msgstr "Trascina l'intero desktop"
 
 #: src/modules/pager/e_mod_config.c:185
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Altezza popup da tastiera"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:193
 #: src/modules/pager/e_mod_config.c:204
@@ -6069,19 +6178,18 @@ msgstr ""
 "abortire"
 
 #: src/modules/pager/e_mod_config.c:328
-#, fuzzy
 msgid "Attetion"
-msgstr "Azione"
+msgstr "Attenzione"
 
 #: src/modules/pager/e_mod_config.c:329
-#, 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 ""
-"Non potete usare il tasto destro del mouse<br>per questo poichè è già usato "
-"dal codice<br>interno per il menù contestuale."
+"Non potete usare il tasto destro del mouse<br>nella mensola poichè è già "
+"usato dal codice<br>interno per il menù contestuale.<br>Questo tasto "
+"funziona solo nel popup."
 
 #: src/modules/pager/e_mod_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
@@ -6095,29 +6203,25 @@ msgstr "Configurazione desktop virtuali"
 
 #: src/modules/pager/e_mod_main.c:2806
 msgid "Show Pager Popup"
-msgstr ""
+msgstr "Mostra popup del pager"
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
-#, fuzzy
 msgid "Popup Desk Right"
-msgstr "Cambia desktop verso destra"
+msgstr "Popup del desktop a destra"
 
 #: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2847
-#, fuzzy
 msgid "Popup Desk Left"
-msgstr "Cambia desktop verso sinistra"
+msgstr "Popup del desktop a sinistra"
 
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
 msgid "Popup Desk Up"
-msgstr "Velocità del popup"
+msgstr "Popup del desktop sopra"
 
 #: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
 msgid "Popup Desk Down"
-msgstr "Cambia desktop verso il basso"
+msgstr "Popup del desktop sotto"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Start"
 
@@ -6125,111 +6229,111 @@ msgstr "Start"
 msgid "Temperature Configuration"
 msgstr "Configurazione modulo Temperature"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Unità di misura"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Centigradi"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Frequenza di campionamento"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Veloce"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Lento"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Molto lento"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Alta temperatura"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Bassa temperatura"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensori"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperature"
 
@@ -6248,12 +6352,3 @@ msgstr "Indietro"
 #: src/modules/wizard/page_010.c:25
 msgid "Choose Language"
 msgstr "Scegli lingua"
-
-#~ msgid "Error - Invalid Button"
-#~ msgstr "Errore - Pulsante non valido"
-
-#~ msgid "NO INFO"
-#~ msgstr "NESSUNA INFORMAZIONE"
-
-#~ msgid "NO BAT"
-#~ msgstr "NESSUNA BATTERIA"
diff --git a/po/ja.gmo b/po/ja.gmo
index 46be887..b6699d8 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index e6ab253..3cc8629 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2007-12-23 09:25+0900\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-03-20 14:00+0900\n"
 "Last-Translator: Yasufumi Haga <yasufumi.haga at nifty.com>\n"
 "Language-Team: E17-jp <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment について"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -58,15 +58,15 @@ msgstr "本当にこのウィンドウを強制終了しますか"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "はい"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "いいえ"
 
@@ -123,341 +123,321 @@ msgid ""
 "suspend to disk?"
 msgstr "ハイバネートしようとしています.<br><br>本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "ウィンドウ: 動作"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "サイズ変更"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "メニュー"
 
 #
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "ウィンドウメニュー"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "上げる"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "下げる"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "閉じる"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "強制終了"
 
 #
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "ウィンドウ: 状態"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "常時表示モード反転"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "アイコンモード反転"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "全画面モード反転"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "最大化"
 
 #
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "垂直に最大化"
 
 #
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "全面表示"
 
 #
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化モード \"賢く\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化モード \"拡大\""
 
 #
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化モード \"空きまで"
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "上方シェード反転"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "下方シェード反転"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "左方シェード反転"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "右方シェード反転"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "シェード状態反転"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "ボーダー無し状態反転"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "位置固定状態反転"
 
 #
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "下のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "デスクトップを指定分移動する"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "デスクトップ背景を出す"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "デスクトップを順に移動する..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "デスクトップ 0 に切り替える"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "デスクトップ 1 に切り替える"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "デスクトップ 2 に切り替える"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "デスクトップ 3 に切り替える"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "デスクトップ 4 に切り替える"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "デスクトップ 5 に切り替える"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "デスクトップ 6 に切り替える"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "デスクトップ 7 に切り替える"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "デスクトップ 8 に切り替える"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "デスクトップ 9 に切り替える"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "デスクトップ 10 に切り替える"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "デスクトップ 11 に切り替える"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "指定のデスクトップに切り替える"
 
-#: src/bin/e_actions.c:2156
-#, fuzzy
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
-msgstr "左のデスクトップへ移動する"
+msgstr "左のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2158
-#, fuzzy
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
-msgstr "右のデスクトップへ移動する"
+msgstr "右のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2160
-#, fuzzy
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
-msgstr "上のデスクトップへ移動する"
+msgstr "上のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2162
-#, fuzzy
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
-msgstr "下のデスクトップへ移動する"
+msgstr "下のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2164
-#, fuzzy
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
-msgstr "デスクトップを指定分移動する"
+msgstr "デスクトップを指定分移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2170
-#, fuzzy
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
-msgstr "指定のデスクトップへ移動する..."
+msgstr "指定のデスクトップへ移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2176
-#, fuzzy
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "デスクトップを順に移動する..."
+msgstr "デスクトップを順に移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2182
-#, fuzzy
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "デスクトップ 0 に切り替える"
+msgstr "デスクトップ 0 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2184
-#, fuzzy
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "デスクトップ 1 に切り替える"
+msgstr "デスクトップ 1 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2186
-#, fuzzy
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "デスクトップ 2 に切り替える"
+msgstr "デスクトップ 2 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2188
-#, fuzzy
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "デスクトップ 3 に切り替える"
+msgstr "デスクトップ 3 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2190
-#, fuzzy
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "デスクトップ 4 に切り替える"
+msgstr "デスクトップ 4 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2192
-#, fuzzy
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "デスクトップ 5 に切り替える"
+msgstr "デスクトップ 5 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2194
-#, fuzzy
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "デスクトップ 6 に切り替える"
+msgstr "デスクトップ 6 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2196
-#, fuzzy
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "デスクトップ 7 に切り替える"
+msgstr "デスクトップ 7 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2198
-#, fuzzy
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "デスクトップ 8 に切り替える"
+msgstr "デスクトップ 8 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2200
-#, fuzzy
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "デスクトップ 9 に切り替える"
+msgstr "デスクトップ 9 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2202
-#, fuzzy
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "デスクトップ 10 に切り替える"
+msgstr "デスクトップ 10 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2204
-#, fuzzy
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "デスクトップ 11 に切り替える"
+msgstr "デスクトップ 11 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2206
-#, fuzzy
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
-msgstr "指定のデスクトップに切り替える"
+msgstr "指定のデスクトップに切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -467,136 +447,136 @@ msgstr "指定のデスクトップに切り替える"
 msgid "Screen"
 msgstr "画面"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "マウスをスクリーン 0 へ移す"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "マウスをスクリーン 1 へ移す"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "マウスを指定のスクリーンへ移す..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "マウスを次のスクリーンへ移す"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "マウスを前のスクリーンへ戻す"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "マウスを指定のスクリーン分だけ前後に移す..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "ウィンドウ: 移動"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "次のデスクトップへ"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "前のデスクトップへ"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "指定分のデスクトップを移動"
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "指定のデスクトップへ..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "メインメニューを表示する"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "お気に入りメニューを表示する"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "全アプリケーションメニューを表示する"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "クライアントメニューを表示する"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "指定のメニューを表示する..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "コマンドの実行"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "定義済みコマンド"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "アプリケーション"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "終了"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "ただちに終了する"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "システム"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "シャットダウン"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "ディスクへサスペンド"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "デスクトップロック"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "ウィンドウ整頓"
 
@@ -605,12 +585,12 @@ msgid "Set As Background"
 msgstr "背景に設定する"
 
 #
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "desktop ファイルスキャン完了"
 
 #
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "desktop ファイルスキャン"
 
@@ -651,11 +631,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "デスクトップ %i,%i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "設定をアップグレードしました"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -667,7 +647,7 @@ msgstr ""
 "ルです.<br>%s<br><br>壊れたデータが使われないように, このファイルは削除されま"
 "した.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -682,7 +662,7 @@ msgstr ""
 "のは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, このファ"
 "イルは削除されました.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -695,7 +675,7 @@ msgstr ""
 "時に処理していたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われない"
 "ように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -708,7 +688,7 @@ msgstr ""
 "ていたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, こ"
 "のファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -719,17 +699,16 @@ msgstr ""
 "ん.<br><br>エラー発生時に処理していたのは以下のファイルです.<br>%s<br><br>壊"
 "れたデータが使われないように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Enlightenment の設定を書き込む時に問題が起きました."
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -738,19 +717,20 @@ msgstr "Enlightenment の設定を書き込む時に問題が起きました."
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "了解"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "詳細設定"
 
@@ -766,14 +746,14 @@ msgstr "適用"
 msgid "Extensions"
 msgstr "拡張機能"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "モジュール"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "コンテナ %d"
@@ -843,7 +823,7 @@ msgstr "デスクトップエントリエディタ"
 
 #
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "アイコン"
@@ -879,7 +859,7 @@ msgstr "一般名称"
 msgid "Window Class"
 msgstr "ウィンドウクラス"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "カテゴリ"
@@ -925,6 +905,7 @@ msgstr "アイコンを選択する"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "取消"
 
@@ -932,7 +913,7 @@ msgstr "取消"
 msgid "Select an Executable"
 msgstr "プログラムの選択"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -940,15 +921,15 @@ msgstr "プログラムの選択"
 msgid "Delete"
 msgstr "削除"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "カット"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "コピー"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "貼り付け"
 
@@ -956,13 +937,13 @@ msgstr "貼り付け"
 msgid "Select All"
 msgstr "すべて選択"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "実行エラー"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
@@ -970,11 +951,11 @@ msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment で以下の子プロセスが fork できませんでした.<br><br>%s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -983,194 +964,195 @@ msgstr ""
 "Enlightenment で以下のアプリケーションが実行できませんでした.<br><br>%"
 "s<br><br>このアプリケーションの起動に失敗しました."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s が突然停止しました"
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s から終了コード %1$i が返りました"
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s に割り込みシグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s に Quit シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s に Abort シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s に浮動小数点エラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s に割り込み不能 kill シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s にセグメンテーションフォールトによる割り込みが入りました"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s に Broken Pipe による割り込みが入りました"
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s に終了シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s にバスエラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s にシグナル番号 %i の割り込みが入りました"
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***残りは切り捨てられました. 出力を保存してから参照してください.***\n"
 
 #
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "エラーログ"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "エラーメッセージはありませんでした"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "このメッセージを保存する"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "このエラーログは %s/%s.log に保存されます"
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "エラー情報"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "エラーシグナル情報"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "出力データ"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "出力はありませんでした"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "存在しないパス"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s が存在しません"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "ファイル数 %i"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "表示モード"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "内容を更新する"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "隠しファイルを表示する"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "順序をを記憶する"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "ただちにソートする"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "新しいディレクトリ"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "名前変更"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "アイコン"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "リスト"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "ディレクトリを新規作成する"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "新しいディレクトリ名"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "名前を %s から変更:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "ファイル名を変更する"
 
 #
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "削除確認"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "以下を本当に削除しますか.<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1224,7 +1206,7 @@ msgid "Owner can write"
 msgstr "所有者が書ける"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1257,49 +1239,49 @@ msgstr "リンク情報"
 msgid "Select an Image"
 msgstr "画像を選択する"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知のボリュームです"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "着脱可能媒体"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "普通"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "埋め込む"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1313,27 +1295,27 @@ msgstr "埋め込む"
 msgid "Appearance"
 msgstr "外観"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "自動的にスクロールする"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "大きさを変える"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を始める"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "このガジェットを削除する"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を終了する"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1364,7 +1346,7 @@ msgstr ""
 "完了してもシグナルに応答しません.<br>正しい初期スプラッシュテーマを使うか, こ"
 "のテーマを修正してください."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "ウィンドウロック"
 
@@ -1400,21 +1382,21 @@ msgid "Lock program changing:"
 msgstr "プログラムに対して以下の変更を禁止する"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "サイズ"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "積み重ね順"
 
@@ -1424,13 +1406,13 @@ msgstr "アイコン化"
 
 #
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "常時表示"
 
 #
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "シェード状態"
 
@@ -1449,7 +1431,7 @@ msgid "Lock me from changing:"
 msgstr "ユーザーに対して以下の変更を禁止する"
 
 #
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "ボーダースタイル"
 
@@ -1471,127 +1453,127 @@ msgstr "このウィンドウを開いたままログインを終了する"
 msgid "Remember these Locks"
 msgstr "以上のロックを記憶する"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "常に一番上に"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "普通"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "常に一番下に"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "垂直に最大化"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "通常サイズ"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "記憶"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "ボーダー"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "他のデスクトップへ移す"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "デスクトップ内で位置を固定する"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "デスクトップ内で位置固定を解除にする"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "状態"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "アイコン編集"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "お気に入りに追加する"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "キーボードショートカットを追加する"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "ランチャーに追加する"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "アイコン作成"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "ウィンドウプロパティ"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "アイコン化"
 
 #
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "ボーダースタイルを選ぶ"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "E17デフォルトのアイコンプリファレンスを使う"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "アプリケーション付属のアイコンを使う"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "ユーザー定義アイコンを使う"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "シェード"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "常時表示"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "全面表示"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "ウィンドウリスト"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1600,6 +1582,10 @@ msgstr "ウィンドウリスト"
 msgid "Pager"
 msgstr "ページャ"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr "タスクバー"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1612,7 +1598,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "ICCCMプロパティ"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "タイトル"
 
@@ -1708,11 +1694,11 @@ msgstr "NetWMプロパティ"
 msgid "Modal"
 msgstr "モーダル"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "タスクバースキップ"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "ページャスキップ"
 
@@ -1720,15 +1706,15 @@ msgstr "ページャスキップ"
 msgid "Hidden"
 msgstr "隠蔽"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "ウィンドウ属性の記憶"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "ウィンドウのプロパティが一意ではありません."
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1752,11 +1738,11 @@ msgstr ""
 "<br>適用されます.<br>よく分からなければ<hilight>取消</hilight>ボタンを押して"
 "下さい. そうすれば何も変更されません."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "一致するプロパティが設定されていません"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1767,7 +1753,7 @@ msgstr ""
 "置, ボーダースタイルなどの<br>プロパティを必ず適用するよう Enlightenment に要"
 "求しています.<br><br>最低 1 種類は記憶方法を指定して下さい."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1795,120 +1781,120 @@ msgstr ""
 "い. それで,ここで設定した内容が<br>適用されます.<br>よく分からなければ"
 "<hilight>取消</hilight>ボタンを押して下さい. そうすれば何も変更されません."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "無し"
 
 #
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "サイズと位置"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "ロック"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "サイズ, 位置, およびロック"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "すべて"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "記憶する基準は"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "ウィンドウの名前とクラス"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "ウィンドウの役割"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "ウィンドウタイプ"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "トランジェンス"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "記憶するプロパティ"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "アイコン・プリファレンス"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "仮想デスクトップ"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "現在のスクリーン"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "ウィンドウリストをスキップする"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "このウィンドウだけに適用する"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "ログイン時にこのプログラムを実行する"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
-msgstr ""
+msgstr "起動時に必ずフォーカスを当てる"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "設定"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "ファイルマネージャ"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr "シェルフ"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "モジュールの設定"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "利用できるモジュール"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "モジュールをロードする"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "ロード済みモジュール"
 
 #
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "モジュールをアンロードする"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1973,10 +1959,12 @@ msgstr "お気に入りのアプリケーション"
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2002,52 +1990,52 @@ msgstr "シェルフ"
 msgid "Show/Hide All Windows"
 msgstr "全ウィンドウを一度に隠す/表示する"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(アプリケーション無し)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "仮想デスクトップを設定する"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "画面をロックする"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "ハイバネート"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "ログアウト"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(ウインドウ無し)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "迷子なウィンドウ"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "名前無し"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(シェルフ無し)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "シェルフ #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "シェルフを追加する"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "シェルフを削除する"
 
@@ -2056,13 +2044,13 @@ msgid "Shelf Configuration"
 msgstr "シェルフの設定"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "とても小さい"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
@@ -2071,12 +2059,12 @@ msgid "Medium"
 msgstr "普通"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "極めて大きい"
 
@@ -2114,7 +2102,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f px"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "スタイル"
 
@@ -2617,14 +2605,12 @@ msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment で order ファイルシステムが準備できません."
 
 #: src/bin/e_main.c:865
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "CPU パワーポリシーを設定する"
+msgstr "省電力モードを設定中"
 
 #: src/bin/e_main.c:869
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment でポップアップシステムが準備できません."
+msgstr "Enlightenment で省電力モードが準備できません."
 
 #: src/bin/e_main.c:901
 msgid "Load Modules"
@@ -2658,7 +2644,7 @@ msgstr "シェルフを設定中"
 msgid "Almost Done"
 msgstr "ほぼ終了"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2667,11 +2653,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>モジュール %s はモジュール"
 "の検索パスにありません.<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "モジュールのロードエラー"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2680,11 +2666,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>このモジュールのフルパスは"
 "以下のとおりです.<br>%s<br>エラーの内容は以下のとおりです.<br>%s<br>"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "モジュールに不足している機能があります."
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2695,12 +2681,12 @@ msgstr ""
 "モジュール API が必要です.<br>Enlightenment で提供されているモジュール API の"
 "バージョンは %i です.<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s モジュール"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "このモジュールをアンロードしますか?<br>"
 
@@ -2994,9 +2980,9 @@ msgstr "お気に入りに追加する"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "上のディレクトリへ移動"
 
@@ -3033,39 +3019,39 @@ msgstr "禁止"
 msgid "Read-Write"
 msgstr "読書両用"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "バッテリモニターの設定"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "バッテリ容量の低下時に警告を表示する"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "バッテリの監視間隔"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
-#, fuzzy, c-format
+#: src/modules/temperature/e_mod_config.c:380
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f 個"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "警告を出すバッテリの残容量"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3076,73 +3062,53 @@ msgstr "警告を出すバッテリの残容量"
 msgid "%1.0f minutes"
 msgstr "%1.0f 分"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f %%"
 
-#
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "バッテリ"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"バッテリ容量低下<br>使用中のバッテリが切れかけています.<br>AC 電源に切り替え"
-"た方がいいかもしれません."
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "ドライバが変"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "満タン"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "高"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "低"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "危険"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f 秒"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "充電中"
+#
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "バッテリ"
 
 #
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 msgid "Battery Meter"
 msgstr "バッテリメーター"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr "エラー"
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr "不可"
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "時計"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment の設定"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "é …ç›®"
 
@@ -3173,7 +3139,7 @@ msgid "Restart Applications"
 msgstr "再起動アプリケーション"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "全アプリケーション"
 
@@ -3231,7 +3197,7 @@ msgstr "グループ化"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3335,7 +3301,7 @@ msgid "Error Text"
 msgstr "エラーテキスト"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "メニュータイトル"
 
@@ -3344,7 +3310,7 @@ msgid "Menu Title Active"
 msgstr "アクティブなメニューのタイトル"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "メニュー項目"
 
@@ -3353,12 +3319,12 @@ msgid "Menu Item Active"
 msgstr "アクティブなメニュー項目"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "移動時"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "サイズ変更時"
 
@@ -3371,12 +3337,12 @@ msgid "Winlist Label"
 msgstr "ウィンドウリストラベル"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "ウィンドウリストタイトル"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "ウィジェット"
 
@@ -3413,7 +3379,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "リストヘッダー"
 
@@ -3500,6 +3466,7 @@ msgstr "デスクトップ名"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "名前:"
 
@@ -3542,10 +3509,10 @@ msgstr "ロックするまでのアイドル時間"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "ユーザー"
 
@@ -3881,17 +3848,19 @@ msgstr "コンポジットを有効にする"
 msgid "Default Engine"
 msgstr "デフォルトのエンジン"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
-#, fuzzy
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
-msgstr "コンポジットを有効にする"
+msgstr "コンポジット機能を有効にしますか?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"コンポジット機能を有効にするよう選択されました.<br>しかし現在のスクリーンはコ"
+"ンポジット機能に対応していません.<br>それでもコンポジット機能を有効にします"
+"か?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4011,192 +3980,196 @@ msgstr "縦位置"
 msgid "Run Command"
 msgstr "コマンド実行"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "コア"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "タイトルバー"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "テキストブロック(普通)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "テキストブロック(ライト)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "テキストブロック(ビッグ)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "設定パネルタイトル"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "「...について」のタイトル"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "「...について」のバージョン"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "「...について」の内容"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "デスクロックのタイトル"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "ロック解除用パスワード"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "エラーダイアログ"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "コマンド実行"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "スプラッシュのタイトル"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "スプラッシュのテキスト"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "スプラッシュのバージョン"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "テキストフィールド"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "フレーム"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "ラベル"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "ボタン"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "スライダ"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "ラジオボタン"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "チェックボタン"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "リスト項目"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "ファイルマネージャ"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+msgid "Desktop Icon"
+msgstr "デスクトップアイコン"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "小(体裁よい)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "普通(体裁よい)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "大(体裁よい)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "フォントの設定"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "大きい"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "とても大きい"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d px"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "カスタムフォントクラスを有効にする"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "フォントクラス"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "フォントクラスを有効にする"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "ヒンティング"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "バイトコード"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "代替フォント"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "代替フォント名"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "代替フォントを有効にする"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -4235,7 +4208,7 @@ msgid "New"
 msgstr "新規"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "インポート..."
 
@@ -4286,22 +4259,62 @@ msgstr "言語"
 msgid "Input Method Settings"
 msgstr "入力方式の設定"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+msgid "Interaction Settings"
+msgstr "インタラクションの設定"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr "サムスクロールを有効にする"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr "サムドラッグのしきい値"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f px"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr "ドラッグ量の適用しきい値"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%1.0f px/秒"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr "摩擦減速"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, c-format
+msgid "%1.2f sec"
+msgstr "%1.2f 秒"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+msgid "Interaction"
+msgstr "インタラクション"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "言語の設定"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "使用する言語"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "選択されたロケール"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "ロケール"
 
@@ -4620,11 +4633,6 @@ msgstr "X のカーソルを使う"
 msgid "Cursor Size"
 msgstr "カーソルの大きさ"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f px"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "マウスカーソル"
@@ -4659,7 +4667,7 @@ msgid "Images"
 msgstr "画像"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "テーマ"
 
@@ -4817,11 +4825,6 @@ msgstr "スクリーンセーバーが起動するまでの時間"
 msgid "Time until X screensaver alternates"
 msgstr "スクリーンセーバーが切り替わるまでの時間"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "ブランキング"
@@ -4879,23 +4882,23 @@ msgstr "ログイン時にスプラッシュスクリーンを表示する"
 msgid "Startup"
 msgstr "起動時"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "テーマの選択"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "テーマのカテゴリ"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "設定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "解除"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "全解除"
 
@@ -4942,38 +4945,43 @@ msgstr "背景の変更"
 msgid "Transitions"
 msgstr "デスクトップ特殊効果"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "壁紙の設定"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "テーマの壁紙を使う"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "他の画像..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "グラデーション..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr "ネットから..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "壁紙の設定先"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "全デスクトップ"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "このデスクトップ"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "このスクリーン"
 
@@ -5023,7 +5031,7 @@ msgstr "グラデーション作成エラー"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "何らかの理由でグラデーションが作成できませんでした."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "画像の選択..."
 
@@ -5073,17 +5081,17 @@ msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "画像の変換でエラーが発生したため画像が取り込めませんでした."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "画像のインポートエラー"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "画像のコピーでエラーが発生したため画像が取り込めませんでした."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5091,6 +5099,63 @@ msgstr ""
 "Enlightenment で壁紙が取り込めませんでした.<br><br>これは本当に正しい壁紙です"
 "か?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr "壁紙を取得するサイトを選んでください..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr "[%s] 取得中...完了"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr "[%s] 取得中...失敗"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr "[%s] 解析中...完了"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr "[%s] 解析中...失敗"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr "[%s] edje ファイルダウンロード中..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr "[%s] ダウンロード. 完了 %d. 総数 %d"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr "[%s] 画像を選んでください"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr "[%s] edje ファイルダウンロード中... %d%% 完了"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr "[%s] 取得中..."
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5383,6 +5448,62 @@ msgstr "ウィンドウの操作を許可する"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "シェルフの隠蔽動作に合わせてその上のウィンドウの位置, 大きさを調整する"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "ウィンドウ属性の記憶"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "記憶機能を準備中"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "デフォルト"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "アイコン名"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "クラス"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "アイコンクラス"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "タイトル"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "タイトル"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "役割"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "無し"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "ウィンドウリストの設定"
@@ -5456,29 +5577,24 @@ msgid "Cpufreq"
 msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:177
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "0.5 秒ごと"
+msgstr "高速(4 ticks ごと)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "1 秒ごと"
+msgstr "中速(8 ticks ごと)"
 
 #: src/modules/cpufreq/e_mod_main.c:191
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "2 秒ごと"
+msgstr "普通(32 ticks ごと)"
 
 #: src/modules/cpufreq/e_mod_main.c:198
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "5 秒ごと"
+msgstr "低速(64 ticks ごと)"
 
 #: src/modules/cpufreq/e_mod_main.c:205
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "30 秒ごと"
+msgstr "超低速(256 ticks ごと)"
 
 #: src/modules/cpufreq/e_mod_main.c:220
 msgid "Manual"
@@ -5749,19 +5865,19 @@ msgstr "ツールバーを表示する"
 msgid "Go to Parent Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "開く"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "開くツール..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr "コマンド実行"
 
@@ -5875,9 +5991,8 @@ msgid "Display Icon Name"
 msgstr "アイコン名を表示する"
 
 #: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "情報を表示する"
+msgstr "ボーダーキャプションを表示する"
 
 #: src/modules/ibox/e_mod_config.c:130
 msgid "Show windows from all screens"
@@ -5908,9 +6023,8 @@ msgid "Flip desktop on mouse wheel"
 msgstr "マウスホイールでデスクトップを切替える"
 
 #: src/modules/pager/e_mod_config.c:119 src/modules/pager/e_mod_config.c:158
-#, fuzzy
 msgid "Show desktop names"
-msgstr "デスクトップにアイコンを表示する"
+msgstr "デスクトップ名を表示する"
 
 #: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:198
 msgid "Popup Settings"
@@ -5945,7 +6059,7 @@ msgstr "デスクトップ全体をドラッグ"
 
 #: src/modules/pager/e_mod_config.c:185
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "キーアクション・ポップアップの高さ"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:193
 #: src/modules/pager/e_mod_config.c:204
@@ -5996,19 +6110,17 @@ msgstr ""
 "キーを押してください."
 
 #: src/modules/pager/e_mod_config.c:328
-#, fuzzy
 msgid "Attetion"
-msgstr "アクション"
+msgstr "注意"
 
 #: src/modules/pager/e_mod_config.c:329
-#, 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 ""
 "マウスの右ボタンは使用できません.<br>すでに内部コードでコンテキストメニュー用"
-"に確保されています."
+"に確保されています.<br>このボタンはポップアップでしか使えません."
 
 #: src/modules/pager/e_mod_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
@@ -6022,29 +6134,25 @@ msgstr "仮想デスクトップの設定"
 
 #: src/modules/pager/e_mod_main.c:2806
 msgid "Show Pager Popup"
-msgstr ""
+msgstr "ページャーのポップアップを表示する"
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
-#, fuzzy
 msgid "Popup Desk Right"
 msgstr "右のデスクトップへ移動する"
 
 #: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2847
-#, fuzzy
 msgid "Popup Desk Left"
 msgstr "左のデスクトップへ移動する"
 
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
 msgid "Popup Desk Up"
-msgstr "ポップアップの速度"
+msgstr "上のデスクトップへ移動する"
 
 #: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
 msgid "Popup Desk Down"
 msgstr "下のデスクトップへ移動する"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr ""
 
@@ -6054,111 +6162,111 @@ msgid "Temperature Configuration"
 msgstr "温度計の設定"
 
 #
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "表示単位"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "セ氏"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "カ氏"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "監視間隔"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "速い"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "遅い"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "とても遅い"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "低温"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "センサー"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "温度計"
 
@@ -6178,6 +6286,31 @@ msgstr "戻る"
 msgid "Choose Language"
 msgstr "言語選択"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "バッテリ容量低下<br>使用中のバッテリが切れかけています.<br>AC 電源に切り替"
+#~ "えた方がいいかもしれません."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "ドライバが変"
+
+#~ msgid "FULL"
+#~ msgstr "満タン"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgid "Danger"
+#~ msgstr "危険"
+
+#~ msgid "Charging"
+#~ msgstr "充電中"
+
 #~ msgid "NO INFO"
 #~ msgstr "情報無し"
 
@@ -7783,9 +7916,6 @@ msgstr "言語選択"
 #~ msgid "Use Icon Theme"
 #~ msgstr "アイコンテーマを使う"
 
-#~ msgid "Icon Class"
-#~ msgstr "アイコンクラス"
-
 #~ msgid "Misc"
 #~ msgstr "その他"
 
@@ -7951,9 +8081,6 @@ msgstr "言語選択"
 #~ msgid "To Desktop 11"
 #~ msgstr "デスクトップ 11 へ"
 
-#~ msgid "Internationalization"
-#~ msgstr "国際化"
-
 #~ msgid "Borderless"
 #~ msgstr "ボーダー無し"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index ea9bc98..876f124 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index da4b38f..bed02fe 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-04-29 23:06+0200\n"
 "Last-Translator: Michael Kim <lavnrose at gmail.com>\n"
 "Language-Team: Korean <KO at li.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment에 대하여"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr ""
@@ -63,15 +63,15 @@ msgstr "이 창을 강제종료 하시겠습니까?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "예"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "아니오"
 
@@ -128,332 +128,332 @@ msgid ""
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "창 : 움직임"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "이동"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "크기변경"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "메뉴"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "창 메뉴"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "말아올림"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "아래로"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "닫기"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "강제종료"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "창 : 상태"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "고정 상태"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "아이콘 상태"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "전체화면 상태"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "최대화"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "높이 최대화"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "넓이 최대화"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "최대화 상태 \"일반\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "최대화 상태 \"확장\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "최대화 상태 \"채우기\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "데스크탑"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -463,136 +463,136 @@ msgstr "데스크탑 변경..."
 msgid "Screen"
 msgstr "화면"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "마우스를 화면 0 으로"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "마우스를 화면 1로"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "마우스를 화면으로 보내기"
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "마우스를 앞의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "마우스를 뒤의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "마우스 앞/뒤 화면으로 보내기..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "창 : 이동"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "다음 데스크탑으로"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "이전 데스크탑으로"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "데스크탑으로..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "메인 메뉴 표시"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "즐겨찾기 메뉴 표시"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "모든 응용프로그램 메뉴 표시"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "클라이언트 메뉴 표시"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "메뉴 표시..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "실행"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "정의된 명령"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "응용프로그램"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "재 시작"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "종료"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "로그아웃"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "임의로 종료"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "시스템"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "시스템 종료"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "재기동"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "대기모드"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr ""
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "데스크탑 고정"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "창 정리"
 
@@ -601,12 +601,12 @@ msgstr "창 정리"
 msgid "Set As Background"
 msgstr "ë°°ê²½"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "데스크탑 이름"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "데스크탑 이름"
@@ -636,11 +636,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "데스크탑 %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "설정이 갱신됨"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -648,7 +648,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -658,7 +658,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -667,7 +667,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -676,7 +676,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -684,18 +684,17 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -704,19 +703,20 @@ msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "확인"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "고급설정"
 
@@ -732,14 +732,14 @@ msgstr "적용"
 msgid "Extensions"
 msgstr "확장"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "모듈"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr ""
@@ -797,7 +797,7 @@ msgid "Desktop Entry Editor"
 msgstr ""
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "아이콘"
@@ -834,7 +834,7 @@ msgstr "일반 정보"
 msgid "Window Class"
 msgstr "창 클래스"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "항목"
@@ -884,6 +884,7 @@ msgstr "아이콘 선택"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "취소"
 
@@ -892,7 +893,7 @@ msgstr "취소"
 msgid "Select an Executable"
 msgstr "이미지 선택"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -900,16 +901,16 @@ msgstr "이미지 선택"
 msgid "Delete"
 msgstr "삭제"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 #, fuzzy
 msgid "Cut"
 msgstr "사용자 지정"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 #, fuzzy
 msgid "Paste"
 msgstr "빠름"
@@ -919,24 +920,24 @@ msgstr "빠름"
 msgid "Select All"
 msgstr "모두 삭제"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "실행 오류"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "자식 프로세스 오류:<br><br>%s<Br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "응용프로그램 실행 오류"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -945,194 +946,194 @@ msgstr ""
 "Enlightenment이 응용프로그램을 실행 할 수 없습니다:<br><br>%s<br><br>The 응용"
 "프로그램 시작 실패."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "오류 기록"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "오류 메세지가 없음."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "이 메세지 저장"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "오류 메세지"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "시그널 정보 오류"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "출력 데이터"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "출력물이 없음."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i 개의 파일"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "일반 대화창"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "새로 고침"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "숨김 파일 표시"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "정렬순서 저장"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "ì •ë ¬"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "새 디렉토리"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "속성"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "아이콘"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "창 목록"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "새 디렉토리 작성"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "디렉토리 명:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s 이름 변경:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "삭제 확인"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1184,7 +1185,7 @@ msgid "Owner can write"
 msgstr "소유자는 쓸수 있음"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1218,49 +1219,49 @@ msgstr "오류 메세지"
 msgid "Select an Image"
 msgstr "이미지 선택"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "알수없음"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "이동식 장치"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1274,27 +1275,27 @@ msgstr ""
 msgid "Appearance"
 msgstr "외관"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1322,7 +1323,7 @@ msgid ""
 "init<br>splash theme that is correctly made or fix the<br>one you use."
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "ì°½ ê³ ì •"
 
@@ -1356,21 +1357,21 @@ msgid "Lock program changing:"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "위치"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "크기"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "고정상태"
 
@@ -1379,12 +1380,12 @@ msgid "Iconified state"
 msgstr "아이콘 상태"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "화면 고정"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr ""
 
@@ -1400,7 +1401,7 @@ msgstr "전체화면 상태"
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "테두리 형태"
 
@@ -1420,131 +1421,131 @@ msgstr ""
 msgid "Remember these Locks"
 msgstr "고정 내용을 기억"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "항상 위에"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "보통"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "항상 아래로"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "수직으로 최대화"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "수평으로 최대화"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "최대화에서 복원"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "기억"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "테두리"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "상태"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "아이콘 편집"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 #, fuzzy
 msgid "Add To Favorites Menu"
 msgstr "즐겨찾기에 추가"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 #, fuzzy
 msgid "Add To Launcher"
 msgstr "실행할 프로그램 추가"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "아이콘 생성"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "창 속성"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "아이콘화"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 #, fuzzy
 msgid "Select Border Style"
 msgstr "기본 테두리"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "응용프로그램의 아이콘"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "사용자 정의 디렉토리"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "창 목록"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1553,6 +1554,10 @@ msgstr "창 목록"
 msgid "Pager"
 msgstr "페이저"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr ""
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1565,7 +1570,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "ICCM 속성"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "제목"
 
@@ -1661,11 +1666,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr ""
 
@@ -1673,15 +1678,15 @@ msgstr ""
 msgid "Hidden"
 msgstr "숨김"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "창 기억"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1695,11 +1700,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1707,7 +1712,7 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1724,125 +1729,125 @@ msgid ""
 "affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "없음"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "크기와 위치"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "ê³ ì •"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "크기, 위치, 고정상태"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "모두"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "기억하기 사용"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "창 이름과 클래스"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "속성 기억"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "가상 데스크탑"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 #, fuzzy
 msgid "Current Screen"
 msgstr "사용자 지정 화면잠금"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "창 목록 무시"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "하나의 창만 일치"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "로그인시 이 프로그램 시작"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "설정"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "이름 변경"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "도구모음 크기"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "모듈 설정"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 #, fuzzy
 msgid "Available Modules"
 msgstr "사용가능한 도구"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 #, fuzzy
 msgid "Load Module"
 msgstr "모듈"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "모듈"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 #, fuzzy
 msgid "Unload Module"
 msgstr "모듈 읽기 오류"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1906,10 +1911,12 @@ msgstr "자주 실행하는 응용프로그램"
 msgid "Applications"
 msgstr "응용 프로그램"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "ì°½"
 
@@ -1935,52 +1942,52 @@ msgstr ""
 msgid "Show/Hide All Windows"
 msgstr "모든 창 표시/숨기기"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(응용프로그램 없음)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "가상 데스크탑 설정"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "화면 잠금"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "하이버네이션"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "로그아웃"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(창 없음)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "잃어버린 창"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "이름 없음!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Shelf 추가"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Shelf 삭제"
 
@@ -1989,13 +1996,13 @@ msgid "Shelf Configuration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "가벼움"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
@@ -2004,12 +2011,12 @@ msgid "Medium"
 msgstr "보통"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "거대함"
 
@@ -2047,7 +2054,7 @@ msgid "%3.0f pixels"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "스타일"
 
@@ -2565,18 +2572,18 @@ msgstr "설정된 도구모음"
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, 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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "모듈 읽기 오류"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2585,11 +2592,11 @@ msgstr ""
 "오류가 있는 추가기능: %s<br>이 모듈의 전체 경로:<br>%s<br>오류 보고서:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "모듈이 필요로하는 기능을 포함하고 있지 않습니다."
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2597,12 +2604,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 모듈"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "이 모듈을 제거 하시겠습니까?<br>"
 
@@ -2887,9 +2894,9 @@ msgstr "즐겨찾기에 추가"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "상위 디렉토리로"
 
@@ -2926,39 +2933,39 @@ msgstr "숨겨짐"
 msgid "Read-Write"
 msgstr "읽기-쓰기"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "밧데리 감시 설정"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "기본 설정"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "밧데리 전원이 낮을 경우 알림 표시"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "고급 설정"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "항상 밧데리 확인:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f 개"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "밧데리가 다음 이하일 경우 경고:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -2969,70 +2976,52 @@ msgstr "밧데리가 다음 이하일 경우 경고:"
 msgid "%1.0f minutes"
 msgstr "%1.0f 분"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, fuzzy, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f ì´ˆ"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "밧데리"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "잘못된 드라이버"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "가득참"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "높음"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "낮음"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "위험"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f ì´ˆ"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "충전중"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "밧데리"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "밧데리"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "시계"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment 설정"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3064,7 +3053,7 @@ msgid "Restart Applications"
 msgstr "응용프로그램 재시작"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "모든 응용프로그램"
 
@@ -3124,7 +3113,7 @@ msgstr "그룹으로"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3228,7 +3217,7 @@ msgid "Error Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr ""
 
@@ -3237,7 +3226,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr ""
 
@@ -3246,12 +3235,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr ""
 
@@ -3264,12 +3253,12 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr ""
 
@@ -3306,7 +3295,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr ""
 
@@ -3392,6 +3381,7 @@ msgstr "데스크탑 이름"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "이름:"
 
@@ -3434,10 +3424,10 @@ msgstr "유휴시간 설정"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "개인용"
 
@@ -3762,11 +3752,11 @@ msgstr ""
 msgid "Default Engine"
 msgstr "기본값"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr ""
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3890,194 +3880,199 @@ msgstr "Y-Axis ì •ë ¬"
 msgid "Run Command"
 msgstr "명령 실행"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "닫기"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "이름 변경"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "데스크탑 표시"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, fuzzy, c-format
 msgid "%d pixels"
 msgstr "%2.0f 픽셀"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "글꼴"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -4116,7 +4111,7 @@ msgid "New"
 msgstr "새로 만들기"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "가져오기..."
 
@@ -4164,22 +4159,64 @@ msgstr "언어"
 msgid "Input Method Settings"
 msgstr "입력기 설정"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "선택 설정"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f 픽셀/초"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f ì´ˆ"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "일반"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "언어 설정"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "언어 선택기"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "언어가 선택됨"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "언어"
 
@@ -4494,11 +4531,6 @@ msgstr "X 커서 사용"
 msgid "Cursor Size"
 msgstr "커서 크기"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr ""
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "마우스 커서"
@@ -4536,7 +4568,7 @@ msgid "Images"
 msgstr "이미지"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "테마"
 
@@ -4699,11 +4731,6 @@ msgstr "X 화면 보호기가 시작 될때 까지"
 msgid "Time until X screensaver alternates"
 msgstr "X 화면보호기가 동작될때"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f ì´ˆ"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "깜빡임"
@@ -4760,25 +4787,25 @@ msgstr "로그인시 환영화면 보기"
 msgid "Startup"
 msgstr "시작"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "테마 선택기"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 #, fuzzy
 msgid "Theme Categories"
 msgstr "항목"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 #, fuzzy
 msgid "Clear"
 msgstr "가깝게"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 #, fuzzy
 msgid "Clear All"
 msgstr "모두 삭제"
@@ -4823,38 +4850,43 @@ msgstr "배경 변경"
 msgid "Transitions"
 msgstr "변화"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "배경 설정"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "테마 배경 사용"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "사진..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "그라데이션..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "배경을 적용할 곳"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "모든 데스크탑"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "이 데스크탑"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "이 화면"
 
@@ -4904,7 +4936,7 @@ msgstr ""
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "그림 선택..."
 
@@ -4954,22 +4986,79 @@ msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5263,6 +5352,61 @@ msgstr ""
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "마우스가 다가오면 자동으로 펴짐"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "창 기억"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "기억"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "아이콘 이름"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "클래스"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "아이콘 클래스"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "제목"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "제목"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "파일:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<없음>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "창 목록 설정"
@@ -5609,19 +5753,19 @@ msgstr ""
 msgid "Go to Parent Directory"
 msgstr "상위 디렉토리로 이동"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "열기"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "다른 프로그램으로 열기.."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "정의된 응용프로그램"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "명령 실행"
@@ -5915,7 +6059,7 @@ msgstr "위로 이동"
 msgid "Popup Desk Down"
 msgstr "아래로 이동"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "시작"
 
@@ -5923,111 +6067,111 @@ msgstr "시작"
 msgid "Temperature Configuration"
 msgstr "온도 설정"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "표시 형태"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "섭씨"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "화씨"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "확인 간격"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "빠름"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "느림"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "매우 느림"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "고오ㄴ"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "저온"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "센서"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "온도"
 
@@ -6050,6 +6194,24 @@ msgstr "기본"
 msgid "Choose Language"
 msgstr "언어"
 
+#~ msgid "BAD DRIVER"
+#~ msgstr "잘못된 드라이버"
+
+#~ msgid "FULL"
+#~ msgstr "가득참"
+
+#~ msgid "High"
+#~ msgstr "높음"
+
+#~ msgid "Low"
+#~ msgstr "낮음"
+
+#~ msgid "Danger"
+#~ msgstr "위험"
+
+#~ msgid "Charging"
+#~ msgstr "충전중"
+
 #~ msgid "NO INFO"
 #~ msgstr "정보 없음"
 
@@ -6477,9 +6639,6 @@ msgstr "언어"
 #~ msgid "Use Icon Theme"
 #~ msgstr "아이콘 테마 사용"
 
-#~ msgid "Icon Class"
-#~ msgstr "아이콘 클래스"
-
 #~ msgid "Misc"
 #~ msgstr "기타"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index f796a71..83cbbc4 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1d8d630..e87d449 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2008-01-24 01:22-0200\n"
 "Last-Translator: Rodrigo -MDK- Oliveira <mdkcore at gmail.com>\n"
 "Language-Team: None. But contact-me on <mdkcore at gmail.com>\n"
@@ -19,8 +19,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -64,15 +64,15 @@ msgstr "Você tem certeza que deseja matar esta janela?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Sim"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Não"
 
@@ -139,334 +139,334 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Fechar"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Alternar Modo Viscoso"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Alternar Modo de Iconificação"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Alternar Modo Tela Cheia"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Alternar Modo de Sombra para Cima"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Alternar Modo de Sombra para Baixo"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Alternar Modo de Sombra para Esquerda"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Alternar Modo de Sobra para Direita"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Alternar Modo de Sombra"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Alernar Estado Sem Borda"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Alternar Estado Rreso"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -476,136 +476,136 @@ msgstr "Mudar Para Área de Trabalho..."
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "Por Área de Trabalho #... "
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Lançar"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Comando Definido"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Aplicativo"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Sair Imediatamente"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Desligar"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Suspender para o Disco"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Travar Área de Trabalho"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
@@ -613,11 +613,11 @@ msgstr "Limpar Janelas"
 msgid "Set As Background"
 msgstr "Colocar Como Papel de Parede"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "Varredura nos arquivos da Área de Trabalho pronta"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "Varredura por arquivo na Área de Trabalho"
 
@@ -660,11 +660,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Área de Trabalho %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Configuração Atualizada"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -676,7 +676,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -692,7 +692,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -705,7 +705,7 @@ msgstr ""
 "precisa de substituição.<br><br>O arquivo onde o erro ocorreu foi:<br>%"
 "s<br><br>Este arquivo será apagado para evitar dados corrompidos.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -719,7 +719,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -731,17 +731,16 @@ msgstr ""
 "foi:<br>%s<br><br>Este arquivo será apagado para evitar dados corrompidos."
 "<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Problemas ao Gravar as Configurações do Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -750,19 +749,20 @@ msgstr "Problemas ao Gravar as Configurações do Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "OK"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Avançado"
 
@@ -778,14 +778,14 @@ msgstr "Aplicar"
 msgid "Extensions"
 msgstr "Extensões"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Módulos"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Contêiner %d"
@@ -856,7 +856,7 @@ msgid "Desktop Entry Editor"
 msgstr "Editor de Entrada da Área de Trabalho"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ícone"
@@ -892,7 +892,7 @@ msgstr "Nome Genérico"
 msgid "Window Class"
 msgstr "Classe da Janela"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Categorias"
@@ -937,6 +937,7 @@ msgstr "Selecione um Ícone"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -944,7 +945,7 @@ msgstr "Cancelar"
 msgid "Select an Executable"
 msgstr "Selecione um executável"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -952,15 +953,15 @@ msgstr "Selecione um executável"
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Colar"
 
@@ -968,13 +969,13 @@ msgstr "Colar"
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Erro ao Rodar"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
@@ -983,11 +984,11 @@ msgstr ""
 "Enlightenment está impossibilitado de bifurcar um processo filho:<br><br>%"
 "s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Erro ao executar aplicativo"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -996,193 +997,194 @@ 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:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, 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:432
+#: src/bin/e_exec.c:437
 #, 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:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, 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:444
+#: src/bin/e_exec.c:449
 #, 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:447
+#: src/bin/e_exec.c:452
 #, 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:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, 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:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, 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:515
+#: src/bin/e_exec.c:520
 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:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, 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:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "Caminho inexistente"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "%s não existe"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "Modo de Visão"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Ícones"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, 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:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1236,7 +1238,7 @@ msgid "Owner can write"
 msgstr "Dono pode escrever"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1269,49 +1271,49 @@ msgstr "Informação de Ligação"
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume Desconhecido"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1325,27 +1327,27 @@ msgstr "Inserido"
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Capaz de ser redimensionado"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Iniciar mover/redimensionar este gadget"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Remover este gadget"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/redimensionar este gadget"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1377,7 +1379,7 @@ msgstr ""
 "pode usar um tema de inicialização que esteja correto ou consertar o<br>qual "
 "você usa."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Travas de Janela"
 
@@ -1412,21 +1414,21 @@ msgid "Lock program changing:"
 msgstr "Trava de mudança no programa:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Posição"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Tamanho"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Empilhamento"
 
@@ -1435,12 +1437,12 @@ msgid "Iconified state"
 msgstr "Estado iconificado"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Viscosidade"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Estado protegido"
 
@@ -1456,7 +1458,7 @@ msgstr "Estado tela cheia"
 msgid "Lock me from changing:"
 msgstr "Trave-me de mudanças:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Estilo da borda"
 
@@ -1476,126 +1478,126 @@ msgstr "Sair do meu login com esta janela aberta"
 msgid "Remember these Locks"
 msgstr "Lembrar estas travas"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Sempre por Cima"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Sempre por Baixo"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Borda "
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Enviar para Área de Trabalho"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Prender à Área de Trabalho"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Desprender da Área de Trabalho"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Estado"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Omitir"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Editar Ícone"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Adicionar ao Menu de Favoritos"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "Adicionar Atalho de Teclado"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Adicionar ao Lançador"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Criar Ícone"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propriedades da Janela"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Iconificar"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Selecionar Estilo de Borda"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Usar Preferências Padrões de Ícone do E17"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Usar Ícone Fornecido pelo Aplicativo"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Usar Ícone Definido pelo Usuário"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Protegido"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Viscoso"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Tela Cheia"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1604,6 +1606,11 @@ msgstr "Lista da Janela"
 msgid "Pager"
 msgstr "Pager"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Pular Barra de Tarefas"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1616,7 +1623,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propriedades ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Título"
 
@@ -1712,11 +1719,11 @@ msgstr "Propriedades do NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Pular Barra de Tarefas"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Pular Pager"
 
@@ -1724,15 +1731,15 @@ msgstr "Pular Pager"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Lembrar Janela"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Propriedades da janela não são uma única combinação"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1757,11 +1764,11 @@ msgstr ""
 "hilight><br>e suas configurações serão aceitas. Pressione <hilight>Cancelar</"
 "hilight> se você<br>não está seguro e nada será afetado."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Nenhuma combinação de propriedades designada"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1773,7 +1780,7 @@ msgstr ""
 "para<br>uma janela <hilight>sem especificar como lembrar isso</hilight>."
 "<br><br>Você tem que especificar ao menos 1 maneira de lembrar esta janela."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1804,119 +1811,119 @@ msgstr ""
 "hilight><br>e suas configurações serão aceitas. Pressione <hilight>Cancelar</"
 "hilight> se você<br>não está seguro e nada será afetado."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Tamanho e Posição"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Travas"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Tamanho, Posição e Travas"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Qualquer coisa"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Lembrar usando"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Nome da janela e classe"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Papel da Janela"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Tipo da Janela"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Transiente"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Propriedades para lembrar"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Preferência de Ícone"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Área de Trabalho Virtual"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Tela Atual"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Pular Lista da Janela"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Coincidir somente uma janela"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Iniciar este programa no login"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Configuração"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "Gerenciador de Arquivo"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Configurações dos Módulos"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Gadgets Disponíveis"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Carregar Módulo"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Módulos Carregados"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Descarregar Módulo"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1981,10 +1988,12 @@ msgstr "Aplicativos Favoritos"
 msgid "Applications"
 msgstr "Aplicativos"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2010,52 +2019,52 @@ msgstr "Bandejas"
 msgid "Show/Hide All Windows"
 msgstr "Mostrar/Esconder Todas as Janelas"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Sem Aplicativos)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Configurar Áreas de Trabalho Virtuais"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Travar Tela"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Logout"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Sem Janelas)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Janelas Perdidas"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
@@ -2064,13 +2073,13 @@ msgid "Shelf Configuration"
 msgstr "Configuração da Bandeja"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minúsculo"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pequeno"
 
@@ -2079,12 +2088,12 @@ msgid "Medium"
 msgstr "Médio"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Gigante"
 
@@ -2123,7 +2132,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Estilos"
 
@@ -2684,7 +2693,7 @@ msgstr "Configurar Prateleiras"
 msgid "Almost Done"
 msgstr "Quase Pronto"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2693,11 +2702,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:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Erro carregando Módulo"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2706,11 +2715,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:145
+#: src/bin/e_module.c:157
 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:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2721,12 +2730,12 @@ 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:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s do Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
@@ -3021,9 +3030,9 @@ msgstr "Adicionar a Favoritos"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Subir um Diretório"
 
@@ -3060,39 +3069,39 @@ msgstr "Proibido"
 msgid "Read-Write"
 msgstr "Leitura-Gravação"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Configuração do Monitor de Bateria"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Configurações Básicas"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Checar bateria a cada:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f arquivos"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Alertar quando a bateria estiver abaixo de:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3103,71 +3112,51 @@ msgstr "Alertar quando a bateria estiver abaixo de:"
 msgid "%1.0f minutes"
 msgstr "%1.0f minutos"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f porcento"
 
-#: src/modules/battery/e_mod_main.c:137
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f segundos"
+
+#: src/modules/battery/e_mod_main.c:129
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr ""
-"Bateria Acabando<br>Sua bateria está acabando.<br>Você pode desejar trocar "
-"para uma fonte AC."
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Medidor de Bateria"
 
-#: src/modules/battery/e_mod_main.c:355
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
+#: src/modules/battery/e_mod_main.c:563
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "DRIVER RUIM"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "CHEIO"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Alto"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Baixo"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Perigo"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Carregando"
-
-#: src/modules/battery/e_mod_main.c:1456
-msgid "Battery Meter"
-msgstr "Medidor de Bateria"
-
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Relógio"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Configuração do Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Items"
 
@@ -3198,7 +3187,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
@@ -3255,7 +3244,7 @@ msgstr "Grupo Por"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3362,7 +3351,7 @@ msgid "Error Text"
 msgstr "Logs de Erro"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 #, fuzzy
 msgid "Menu Title"
 msgstr "Título"
@@ -3372,7 +3361,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 #, fuzzy
 msgid "Menu Item"
 msgstr "Títulos do Menu de Item"
@@ -3383,13 +3372,13 @@ msgid "Menu Item Active"
 msgstr "Títulos do Menu de Item"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 #, fuzzy
 msgid "Move Text"
 msgstr "Mover"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 #, fuzzy
 msgid "Resize Text"
 msgstr "Redimensionar"
@@ -3404,13 +3393,13 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 #, fuzzy
 msgid "Winlist Title"
 msgstr "Título do Display"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 #, fuzzy
 msgid "Widgets"
 msgstr "Cores do Widget"
@@ -3449,7 +3438,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 #, fuzzy
 msgid "List Header"
 msgstr "Guia do Cliente"
@@ -3537,6 +3526,7 @@ msgstr "Nome da Área de Trabalho"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Nome:"
 
@@ -3579,10 +3569,10 @@ msgstr "Tempo ocioso para exceder"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Pessoal"
 
@@ -3920,12 +3910,12 @@ msgstr "Ativar Composite"
 msgid "Default Engine"
 msgstr "Engine Padrão"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Ativar Composite"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4051,209 +4041,214 @@ msgstr "Alinhamento ao Eixo-Y"
 msgid "Run Command"
 msgstr "Executar Comando"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "Fechar"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 #, fuzzy
 msgid "Title Bar"
 msgstr "Título"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 #, fuzzy
 msgid "Configure Heading"
 msgstr "Configuração"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 #, fuzzy
 msgid "About Title"
 msgstr "Sobre Este Tema"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 #, fuzzy
 msgid "About Text"
 msgstr "Sobre"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 #, fuzzy
 msgid "Desklock Title"
 msgstr "Arquivo da área de trabalho"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 #, fuzzy
 msgid "Dialog Error"
 msgstr "Diálogos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 #, fuzzy
 msgid "Exebuf Command"
 msgstr "Executar Comando"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 #, fuzzy
 msgid "Splash Title"
 msgstr "Título do Display"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 #, fuzzy
 msgid "Frame"
 msgstr "Taxa de Amostragem"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 #, fuzzy
 msgid "Label"
 msgstr "Rótulos dos Ícones"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 #, fuzzy
 msgid "Buttons"
 msgstr "Botão %i"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 #, fuzzy
 msgid "Slider"
 msgstr "Tamanho"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 #, fuzzy
 msgid "Text List Item"
 msgstr "Menu da Lista do Cliente"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 #, fuzzy
 msgid "List Item"
 msgstr "Lista"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "Gerenciador de Arquivo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Mostrar Ícones da Área de Trabalho"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 #, fuzzy
 msgid "Normal Styled"
 msgstr "Normal"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Configurações da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Realmente Grande"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Ativar Classes de Fonte Customizadas"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualização de texto básica: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Classes da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Ativar Classe da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Sugerindo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Recuos da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Nome do Recuo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Ativar Recuos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Pré-visualização de Texto Avançada.. 我真的会写中文"
 
@@ -4292,7 +4287,7 @@ msgid "New"
 msgstr "Novo"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Importar..."
 
@@ -4344,22 +4339,64 @@ msgstr "Linguagem"
 msgid "Input Method Settings"
 msgstr "Configurações de Métodos de Entrada"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Configurações de Seleção"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pixels"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pixel/seg"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f seg"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interno"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Configuração de Linguagem"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Seletor de Linguagem"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Locale Selecionado"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Locale"
 
@@ -4679,11 +4716,6 @@ msgstr "Usar Cursor do X"
 msgid "Cursor Size"
 msgstr "Tamanho do Cursor"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pixels"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Cursos do Mouse"
@@ -4718,7 +4750,7 @@ msgid "Images"
 msgstr "Imagens"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Temas"
 
@@ -4877,11 +4909,6 @@ msgstr "Tempo até que o X screensaver inicie"
 msgid "Time until X screensaver alternates"
 msgstr "Tempo até que o X screensaver alterne"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segundos"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Blanqueando"
@@ -4940,23 +4967,23 @@ msgstr "Mostrar Tela de Abertura no Login"
 msgid "Startup"
 msgstr "Inicializar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Seletor de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Categorias de Temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Limpar Tudo"
 
@@ -5004,38 +5031,43 @@ msgstr "Mudança de Fundo"
 msgid "Transitions"
 msgstr "Transições"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Configurações do Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Usar Papel de Parede do Tema"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Figura..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Gradiente..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Aonde colocar o Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Todas Áreas de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Esta Área de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Esta Tela"
 
@@ -5085,7 +5117,7 @@ msgstr "Erro na Criação do Gradiente"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Por algum motivo, Enlightenment foi incapaz de criar um gradiente."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Selecione uma Figura..."
 
@@ -5137,19 +5169,19 @@ msgstr ""
 "Enlightenment está impossibilitado de importar a figura<br>devido a erros de "
 "conversão."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Erro ao Importar Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 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_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5157,6 +5189,63 @@ msgstr ""
 "Enlightenment está impossibilitado de importar o papel de parede."
 "<br><br>Você tem certeza que este é um papel de parede válido?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5450,6 +5539,62 @@ msgstr "Permitir manipulação da janela"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automaticamente mover/redimensionar janelas ao esconder bandeja"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Lembrar Janela"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Configurar Lembraças"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Padrões"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Nome do Ícone"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Classe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Título"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Título"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Papel"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Nenhum>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Ajustes da Janela da Lista"
@@ -5814,19 +5959,19 @@ msgstr "Mostrar Barra de Ferramentas"
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
 msgstr "Comando Customizado"
 
@@ -6119,7 +6264,7 @@ msgstr "Virar Área de Trabalho Acima"
 msgid "Popup Desk Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Iniciar"
 
@@ -6127,111 +6272,111 @@ msgstr "Iniciar"
 msgid "Temperature Configuration"
 msgstr "Configuração da Temperatura"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Unidades do Display"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celsius"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Intervalo de Checagem"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Devagar"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Muito Devagar"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Temperatura Alta"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Temperatura Baixa"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6251,6 +6396,31 @@ msgstr "Voltar"
 msgid "Choose Language"
 msgstr "Escolha a Linguagem"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Bateria Acabando<br>Sua bateria está acabando.<br>Você pode desejar "
+#~ "trocar para uma fonte AC."
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "DRIVER RUIM"
+
+#~ msgid "FULL"
+#~ msgstr "CHEIO"
+
+#~ msgid "High"
+#~ msgstr "Alto"
+
+#~ msgid "Low"
+#~ msgstr "Baixo"
+
+#~ msgid "Danger"
+#~ msgstr "Perigo"
+
+#~ msgid "Charging"
+#~ msgstr "Carregando"
+
 #~ msgid "Pager Settings"
 #~ msgstr "Configurações do Pager"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 6f7ee0c..940bf7f 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 8df6bc5..b2ef3e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,20 +8,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
-"PO-Revision-Date: 2007-07-29 21:43+0200\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
+"PO-Revision-Date: 2008-03-15 20:40+0200\n"
 "Last-Translator: Danny Moshnakov <admin at moshnakov.org>\n"
 "Language-Team: Russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
 
 #: src/bin/e_about.c:66
 msgid "About Enlightenment"
 msgstr "Об Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -68,15 +69,15 @@ msgstr "Вы действительно хотите убить это окно?
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Да"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Нет"
 
@@ -139,334 +140,314 @@ msgstr ""
 "Вы запросили \"заморозить\" ваш компьютер.<br><br>Вы действительно хотите "
 "этого?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "Окно: Действия"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "Двигать"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "Измененить Размер"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "Меню Окна"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "Повысить"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "Понизить"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Убить"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "Окно: Состояние"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "Включить Режим Окна \"Sticky\""
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "Переключить Иконизированое Состояние"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "Переключить Полноэкранный Режим "
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Увеличить"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "Увеличить на Полный Экран"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим Увеличения \"Умный\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим Увеличения \"Разширение\""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим Увеличения \"Заполнить\""
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "Переключить Режим Свернуть Вверх"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "Переключить Режим Свернуть Вниз"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "Переключить Режим Свернуть Влево"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "Переключить Режим Свернуть Вправо"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "Переключить Свёрнутый Режим"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "Переключить Режим Без Бордюра"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "Переключить Режим Прикрепления"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
-msgstr "Переключить Стол Влево"
+msgstr "Перенести Стол Влево"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
-msgstr "Переключить Стол Вправо"
+msgstr "Перенести Стол Вправо"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
-msgstr "Переключить Стол Вверх"
+msgstr "Перенести Стол Вверх"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
-msgstr "Переключить Стол Вниз"
+msgstr "Перенести Стол Вниз"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
-msgstr "Переключить Стол По..."
+msgstr "Перенести Стол По..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "Показать Рабочий Стол"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
-msgstr "Переключить Стол на..."
+msgstr "Перенести Стол На..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
-msgstr "Перейти Стол Линейно..."
+msgstr "Перенести Стол Линейно..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "Переключить на Рабочий Стол 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "Переключить на Рабочий Стол 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "Переключить на Рабочий Стол 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "Переключить на Рабочий Стол 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "Переключить на Рабочий Стол 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "Переключить на Рабочий Стол 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "Переключить на Рабочий Стол 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "Переключить на Рабочий Стол 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "Переключить на Рабочий Стол 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "Переключить на Рабочий Стол 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "Переключить на Рабочий Стол..."
 
-#: src/bin/e_actions.c:2156
-#, fuzzy
+#: src/bin/e_actions.c:2157
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Переключить Стол Влево"
+msgstr "Перенести Стол Влево (Все Экраны)"
 
-#: src/bin/e_actions.c:2158
-#, fuzzy
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Переключить Стол Вправо"
+msgstr "Перенести Стол Вправо (Все Экраны)"
 
-#: src/bin/e_actions.c:2160
-#, fuzzy
+#: src/bin/e_actions.c:2161
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Переключить Стол Вверх"
+msgstr "Перенести Стол Вверх (Все Экраны)"
 
-#: src/bin/e_actions.c:2162
-#, fuzzy
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Переключить Стол Вниз"
+msgstr "Перенести Стол Вниз (Все Экраны)"
 
-#: src/bin/e_actions.c:2164
-#, fuzzy
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Переключить Стол По..."
+msgstr "Перенести Стол Через... (Все Экраны)"
 
-#: src/bin/e_actions.c:2170
-#, fuzzy
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Переключить Стол на..."
+msgstr "Перенести Стол На... (Все Экраны)"
 
-#: src/bin/e_actions.c:2176
-#, fuzzy
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Перейти Стол Линейно..."
+msgstr "Перенести Стол Линейно... (Все Экраны)"
 
-#: src/bin/e_actions.c:2182
-#, fuzzy
+#: src/bin/e_actions.c:2183
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Переключить на Рабочий Стол 0"
+msgstr "Переключиться На Раб. Стол 0 (Все Экраны)"
 
-#: src/bin/e_actions.c:2184
-#, fuzzy
+#: src/bin/e_actions.c:2185
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Переключить на Рабочий Стол 1"
+msgstr "Переключиться На Раб. Стол 1 (Все Экраны)"
 
-#: src/bin/e_actions.c:2186
-#, fuzzy
+#: src/bin/e_actions.c:2187
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Переключить на Рабочий Стол 2"
+msgstr "Переключиться На Раб. Стол 2 (Все Экраны)"
 
-#: src/bin/e_actions.c:2188
-#, fuzzy
+#: src/bin/e_actions.c:2189
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Переключить на Рабочий Стол 3"
+msgstr "Переключиться На Раб. Стол 3 (Все Экраны)"
 
-#: src/bin/e_actions.c:2190
-#, fuzzy
+#: src/bin/e_actions.c:2191
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Переключить на Рабочий Стол 4"
+msgstr "Переключиться На Раб. Стол 4 (Все Экраны)"
 
-#: src/bin/e_actions.c:2192
-#, fuzzy
+#: src/bin/e_actions.c:2193
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Переключить на Рабочий Стол 6"
+msgstr "Переключиться На Раб. Стол 5 (Все Экраны)"
 
-#: src/bin/e_actions.c:2194
-#, fuzzy
+#: src/bin/e_actions.c:2195
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Переключить на Рабочий Стол 6"
+msgstr "Переключиться На Раб. Стол 6 (Все Экраны)"
 
-#: src/bin/e_actions.c:2196
-#, fuzzy
+#: src/bin/e_actions.c:2197
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Переключить на Рабочий Стол 7"
+msgstr "Переключиться На Раб. Стол 7 (Все Экраны)"
 
-#: src/bin/e_actions.c:2198
-#, fuzzy
+#: src/bin/e_actions.c:2199
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Переключить на Рабочий Стол 8"
+msgstr "Переключиться На Раб. Стол 8 (Все Экраны)"
 
-#: src/bin/e_actions.c:2200
-#, fuzzy
+#: src/bin/e_actions.c:2201
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Переключить на Рабочий Стол 9"
+msgstr "Переключиться На Раб. Стол 9 (Все Экраны)"
 
-#: src/bin/e_actions.c:2202
-#, fuzzy
+#: src/bin/e_actions.c:2203
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Переключить на Рабочий Стол 10"
+msgstr "Переключиться На Раб. Стол 10 (Все Экраны)"
 
-#: src/bin/e_actions.c:2204
-#, fuzzy
+#: src/bin/e_actions.c:2205
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Переключить на Рабочий Стол 11"
+msgstr "Переключиться На Раб. Стол 11 (Все Экраны)"
 
-#: src/bin/e_actions.c:2206
-#, fuzzy
+#: src/bin/e_actions.c:2207
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Переключить на Рабочий Стол..."
+msgstr "Переключиться На Рабочий Стол... (Все Экраны)"
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -476,153 +457,150 @@ msgstr "Переключить на Рабочий Стол..."
 msgid "Screen"
 msgstr "Экран"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "Послать Мышь На Экран 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "Послать Мышь На Экран 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "Послать Мышь На Экран..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Послать Мышь 1 Экран Вперёд"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "Послать Мышь 1 Экран Назад"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Послать Мышь Вперед/Назад..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "Окно: Передвижение"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "На Следующий Рабочий Стол"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "На Предыдущий Рабочий Стол"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "По # Стола..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "На Рабочий Стол..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "Показать Главное Меню"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "Показать Избранное Меню"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "Показать Меню \"Все Приложения\""
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "Показать Меню Клиента"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "Показать Меню..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "Запустить"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "Определённая Комманда"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "Приложение"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "Выход"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "Выход из Сессии"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "Выход Немедленно"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "Система"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "Выключить"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "Перегрузить"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "Приостановить на Диск"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "Закрыть Рабочий Стол"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Расчистить Окна"
 
 #: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
-#, fuzzy
 msgid "Set As Background"
-msgstr "Фоны"
+msgstr "Установить Как Фон"
 
-#: src/bin/e_border.c:4429
-#, fuzzy
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
-msgstr "Файл Desktop"
+msgstr "Сканирование файлов запуска программ завершено"
 
-#: src/bin/e_border.c:4441
-#, fuzzy
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
-msgstr "Файл Desktop"
+msgstr "Сканирование файлов запуска программ"
 
 #: src/bin/e_config.c:593
 msgid ""
@@ -661,11 +639,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Рабочий стол %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Настройки Изменились"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -676,7 +654,7 @@ msgstr ""
 "<br><br>Файл, где произошла ошибка , был: <br>%s<br><br>Этот файл был "
 "удалён, чтобы избежать испорченных данных. <br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -692,7 +670,7 @@ msgstr ""
 "произошла ошибка, был: <br>%s<br><br>Этот файл был удалён, чтобы избежать "
 "порчи данных. <br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -705,7 +683,7 @@ msgstr ""
 "ошибка: <br><br> %s <br><br> Этот файл был удалён, чтобы избежать порчи "
 "данных.<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -718,7 +696,7 @@ msgstr ""
 "лимит квоты.<br><br>Файл, где произошла ошибка , был: <br>%s<br><br>Этот "
 "файл был удалён, чтобы избежать испорченных данных. <br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -729,18 +707,16 @@ msgstr ""
 "момент записи. Это очень не обычно.<br>Файл, где произошла ошибка , был: <br>"
 "%s<br><br>Этот файл был удалён, чтобы избежать испорченных данных. <br>"
 
-#: src/bin/e_config.c:2306
-#, fuzzy
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Проблемы Записи Конфигурации Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -749,19 +725,20 @@ msgstr "Проблемы Записи Конфигурации Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "ОК"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Дополнительно"
 
@@ -777,14 +754,14 @@ msgstr "Применить"
 msgid "Extensions"
 msgstr "Расширения"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Модули"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
@@ -856,7 +833,7 @@ msgid "Desktop Entry Editor"
 msgstr "Редактор Программ"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Иконка"
@@ -892,20 +869,18 @@ msgstr "Общее Имя"
 msgid "Window Class"
 msgstr "Класс Окна"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "Категории"
 
 #: src/bin/e_eap_editor.c:511
-#, fuzzy
 msgid "Mime Types"
-msgstr "Типы Файлов"
+msgstr "Типы MIME"
 
 #: src/bin/e_eap_editor.c:517
-#, fuzzy
 msgid "Options"
-msgstr "Опции Заполнения"
+msgstr "Опции"
 
 #: src/bin/e_eap_editor.c:518
 msgid "Startup Notify"
@@ -939,6 +914,7 @@ msgstr "Выбрать Иконку"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -946,7 +922,7 @@ msgstr "Отменить"
 msgid "Select an Executable"
 msgstr "Выберите Исполняемый Файл"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -954,15 +930,15 @@ msgstr "Выберите Исполняемый Файл"
 msgid "Delete"
 msgstr "Стереть"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "Вставить"
 
@@ -970,24 +946,24 @@ msgstr "Вставить"
 msgid "Select All"
 msgstr "Выделить Всё"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Ошибка Запуска"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment не смог запустить дочерний процесс:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Ошибка запуска приложения"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -996,194 +972,193 @@ msgstr ""
 "Enlightenment не смог запустить приложение:<br><br>%s<br><br>приложение не "
 "запустилось."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Ошибка Выполнения Приложения"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s неожиданно закончил исполнение."
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Код выхода %i был возвращен из %s."
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s было прервано Сигналом Прерыва."
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s было прервано Сигналом Выхода."
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s было прервано Сигналом Аварийного прекращения работы."
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s было прервано Ошибкой Плавающей Запятой."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s было прервано Сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s было прервано Ошибкой Сегментации."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s было прервано Ошибкой Broken Pipe."
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s было прервано Сигналом Завершения."
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s было прервано Ошибкой Bus Error."
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s было прервано сигналом номер %i."
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** Остаток вывода был обрезан. Сохраните для просмотра. ***\n"
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Лог Ошибки"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Не было сообщения ошибки."
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Сохранить Это Сообщение"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Этот лог об ошибке будет сохранён как %s/%s.log"
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Информация об Ошибке"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Информация Сигнала об Ошибке"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Выход Данных"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Не было никаких данных."
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
-msgstr ""
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
+msgstr "Несуществующий путь"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
-msgstr ""
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
+msgstr "%s не существует"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i файлов"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
-#, fuzzy
 msgid "View Mode"
-msgstr "Базовый Режим"
+msgstr "Режим Отображения"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "Обновить Вид"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "Показать  Скрытые Файлы"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "Запомнить Очередность"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "Сортировать"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "Новый Каталог"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Иконки"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
-#, fuzzy
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
-msgstr "Список Окон"
+msgstr "Список"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "Создать новый каталог"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "Имя Нового Каталога:"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "Переименовать %s в:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "Переименовать Файл"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "Подтвердите Удаление"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Вы действительно хотите стереть <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1237,7 +1212,7 @@ msgid "Owner can write"
 msgstr "Владелец может писать"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1270,49 +1245,49 @@ msgstr "Информация о Ссылке"
 msgid "Select an Image"
 msgstr "Выбрать Изображение"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
-msgstr ""
+msgstr "%lluТиБ"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
-msgstr ""
+msgstr "%llu ГиБ"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
-msgstr ""
+msgstr "%llu МиБ"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
-msgstr ""
+msgstr "%llu КиБ"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
-msgstr ""
+msgstr "%llu Б"
 
-#: src/bin/e_fm_hal.c:227
-#, fuzzy, c-format
+#: src/bin/e_fm_hal.c:251
+#, c-format
 msgid "Unknown Volume"
-msgstr "Не известный"
+msgstr "Не известный Носитель"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr "Съёмное Устройство"
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "В Сэте"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1326,27 +1301,27 @@ msgstr "В Сэте"
 msgid "Appearance"
 msgstr "Вид"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "Автопрокрутка содержимого"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "Может менять размер"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "Начать сдвиг/размер этого гаджета"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "Убрать этот гаджет"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "Завершить сдвиг/размер этого гаджета"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1377,7 +1352,7 @@ msgstr ""
 "неотвечает на сигналы<br>в конце загрузки. Вы должны использовать правильно "
 "сделаную<br>тему init заставки,  либо починить ту, которую<br>вы используете."
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Замки Окна"
 
@@ -1411,21 +1386,21 @@ msgid "Lock program changing:"
 msgstr "Запрет програмам менять:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Позицию"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Уровень"
 
@@ -1434,12 +1409,12 @@ msgid "Iconified state"
 msgstr "Иконизированое состояние"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Липкость"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Свёрнутое состояние"
 
@@ -1455,7 +1430,7 @@ msgstr "Полноэкранное состояние"
 msgid "Lock me from changing:"
 msgstr "Запрет мне менять:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Стиль бордюра"
 
@@ -1475,126 +1450,126 @@ msgstr "Выйти из сессии когда это окно открыто"
 msgid "Remember these Locks"
 msgstr "Запомнить эти Замки"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Всегда Поверху"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Нормально"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Всегда Понизу"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "Обычный размер"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Запомнить"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Бордюр"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Переслать на"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "Прикрепить к Столу"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "Открепить от Стола"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "Состояние"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "Пропускать"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Редактировать Иконку"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "Добавить в Избранное"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
-msgstr ""
+msgstr "Добавить Комбинацию Клавиш"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "Добавить в Панель Запуска"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Создать Иконку"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Свойства Окна"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Опустить"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "Выбор Стиля Бордюра"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "Использовать Иконку от Е17 "
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "Исползовать Иконку от Приложения"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "Использовать Иконку от Пользователя"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Свёрнут"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Липкий"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Полный Экран"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Список Окон"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1603,6 +1578,11 @@ msgstr "Список Окон"
 msgid "Pager"
 msgstr "Пэйджер"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "Пропускает Таскбар"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1615,7 +1595,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Свойства ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1711,11 +1691,11 @@ msgstr "Свойства NetWM"
 msgid "Modal"
 msgstr "Модульное"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "Пропускает Таскбар"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "Пропускает Пэйджер"
 
@@ -1723,15 +1703,15 @@ msgstr "Пропускает Пэйджер"
 msgid "Hidden"
 msgstr "Спрятанное"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Запомнить Окно"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Свойства этого окна не являются уникальным совпадением"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1756,11 +1736,11 @@ msgstr ""
 "hilight><br>и ваш выбор будет принят. Если вы не уверены,<br>нажмите "
 "<hilight>Отмена</hilight>, и ничего не будет затронуто."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Не определены свойства совпадения"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1772,7 +1752,7 @@ msgstr ""
 "способа запоминания</hilight>.<br><br>Вы должны определить по крайней мере 1 "
 "способ запомнить это окно."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1802,133 +1782,130 @@ msgstr ""
 "ваш выбор будет принят. Если вы не уверены,<br>нажмите <hilight>Отмена</"
 "hilight>, и ничего не будет затронуто."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Ничего"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Размер и Позицию"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Замки"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Размер, Позицию и Замки"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Всё"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Запомнить используя"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Имя и класс окна"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Роль Окна"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Тип Окна"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Быстротечность"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Запомнить свойства"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "Предпочтение Иконки"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Виртуальный Рабочий стол"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "Текущий Экран"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Пропуск Окна"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Совпадает только одно окно"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "Запустить эту программу при логине"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
-msgstr ""
+msgstr "Автоматически фокусировать при запуске"
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Настройки"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
-#, fuzzy
 msgid "File Manager"
-msgstr "Управление Файлами"
+msgstr "Файловый менеджер"
 
-#: src/bin/e_int_config_modules.c:43
-#, fuzzy
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
-msgstr "Полка #"
+msgstr "Полка"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Настройки Модулей"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "Доступные Модули"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "Загрузить Модуль"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "Загруженные Модули"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "Выгрузить Модуль"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
-msgstr ""
+msgstr "Описание: Недоступно"
 
 #: src/bin/e_int_gadcon_config.c:32
 msgid "Shelf Contents"
 msgstr "Содержимое Полки"
 
 #: src/bin/e_int_gadcon_config.c:38
-#, fuzzy
 msgid "Toolbar Contents"
-msgstr "Настроить Содержимое Полки"
+msgstr "Содержимое Панели Инструментов"
 
 #: src/bin/e_int_gadcon_config.c:93
 msgid "Available Gadgets"
@@ -1947,9 +1924,8 @@ msgid "Remove Gadget"
 msgstr "Убрать Гаджет"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:328
-#, fuzzy
 msgid "Toolbar Configuration"
-msgstr "Настройки IBar"
+msgstr "Настройка Панели Инструментов"
 
 #: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:499
 #: src/bin/e_int_shelf_config.c:564
@@ -1982,10 +1958,12 @@ msgstr "Избранные Приложения"
 msgid "Applications"
 msgstr "Приложения"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Окна"
 
@@ -2011,52 +1989,52 @@ msgstr "Полки"
 msgid "Show/Hide All Windows"
 msgstr "Показать/Скрыть Все Окна"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Нет приложений)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "Настроить Виртуальные Столы"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Замкнуть Экран"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "Заморозить"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "Логаут"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Нет окон)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Потерянные Окна"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Нет Имени!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(Нет Полок)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Полка #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "Добавить Полку"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "Стереть Полку"
 
@@ -2065,13 +2043,13 @@ msgid "Shelf Configuration"
 msgstr "Настройки Полки"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Тини"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Маленький"
 
@@ -2080,12 +2058,12 @@ msgid "Medium"
 msgstr "Средне"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Большой"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Огромный"
 
@@ -2123,7 +2101,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f пикс."
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "Стили"
 
@@ -2157,14 +2135,12 @@ msgid "Hide duration"
 msgstr "Время сокрытия"
 
 #: src/bin/e_int_shelf_config.c:663
-#, fuzzy
 msgid "Show on all Desktops"
-msgstr "Показать Рабочий Стол"
+msgstr "Показывать на всех Рабочих Столах"
 
 #: src/bin/e_int_shelf_config.c:665
-#, fuzzy
 msgid "Show on specified Desktops"
-msgstr "Показать Рабочий Стол"
+msgstr "Показывать на указанных Рабочих Столах"
 
 #: src/bin/e_ipc.c:48
 #, c-format
@@ -2365,9 +2341,8 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment не может настроить свою систему настроек."
 
 #: src/bin/e_main.c:510
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment не может настроить свою систему языков."
+msgstr "Enlightenment не может настроить систему указателей."
 
 #: src/bin/e_main.c:519
 msgid ""
@@ -2395,7 +2370,7 @@ msgstr ""
 
 #: src/bin/e_main.c:570
 msgid "Testing Format Support"
-msgstr ""
+msgstr "Проверка Поддержки Форматов"
 
 #: src/bin/e_main.c:580
 msgid ""
@@ -2432,7 +2407,7 @@ msgstr ""
 
 #: src/bin/e_main.c:621
 msgid "Starting International Support"
-msgstr ""
+msgstr "Запускается Языковая Поддержка "
 
 #: src/bin/e_main.c:626
 msgid "Enlightenment cannot set up its intl system."
@@ -2440,12 +2415,11 @@ msgstr "Enlightenment не может настроить свою систему
 
 #: src/bin/e_main.c:631
 msgid "Setting up Paths"
-msgstr ""
+msgstr "Идет Настройка Путей"
 
 #: src/bin/e_main.c:648
-#, fuzzy
 msgid "Setup Thumbnailer"
-msgstr "Миниатюра"
+msgstr "Настройка Генератора Просмотра"
 
 #: src/bin/e_main.c:653
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
@@ -2453,25 +2427,23 @@ msgstr "Enlightenment не может настроить систему Thumbnai
 
 #: src/bin/e_main.c:658
 msgid "Setup System Controls"
-msgstr ""
+msgstr "Настройка Системы Управления"
 
 #: src/bin/e_main.c:663
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment не может настроить систему Системных Комманд.\n"
 
 #: src/bin/e_main.c:668
-#, fuzzy
 msgid "Setup Actions"
-msgstr "Стартовые Приложения"
+msgstr "Настройка Действий"
 
 #: src/bin/e_main.c:673
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не может настроить свою систему действий."
 
 #: src/bin/e_main.c:677
-#, fuzzy
 msgid "Setup Bindings"
-msgstr "Горячие Клавиши"
+msgstr "Настройка Назначений"
 
 #: src/bin/e_main.c:682
 msgid "Enlightenment cannot set up its bindings system."
@@ -2479,25 +2451,23 @@ msgstr "Enlightenment не может настроить свою систему
 
 #: src/bin/e_main.c:686
 msgid "Setup Popups"
-msgstr ""
+msgstr "Настройка Подсказок"
 
 #: src/bin/e_main.c:691
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не может настроить свою систему подсказок."
 
 #: src/bin/e_main.c:696
-#, fuzzy
 msgid "Setup Wallpaper"
-msgstr "Обои Стола"
+msgstr "Настройка Фона"
 
 #: src/bin/e_main.c:701
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не может настроить свою систему фона рабочего стола."
 
 #: src/bin/e_main.c:705
-#, fuzzy
 msgid "Setup Screens"
-msgstr "Текущий Экран"
+msgstr "Настройка Экранов"
 
 #: src/bin/e_main.c:710
 msgid ""
@@ -2509,16 +2479,15 @@ msgstr ""
 
 #: src/bin/e_main.c:715
 msgid "Setup Execution System"
-msgstr ""
+msgstr "Настройка Системы Запуска"
 
 #: src/bin/e_main.c:720
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не может настроить свою систему запуска."
 
 #: src/bin/e_main.c:724
-#, fuzzy
 msgid "Setup Remembers"
-msgstr "Запомнить"
+msgstr "Настройка Запоминаний"
 
 #: src/bin/e_main.c:729
 msgid "Enlightenment cannot setup remember settings."
@@ -2526,7 +2495,7 @@ msgstr "Enlightenment не может настроить запоминание
 
 #: src/bin/e_main.c:737
 msgid "Setup FM"
-msgstr ""
+msgstr "Настройка ФМ"
 
 #: src/bin/e_main.c:742
 msgid "Enlightenment cannot initialize the File manager.\n"
@@ -2534,7 +2503,7 @@ msgstr "Enlightenment не может инициализировать мене
 
 #: src/bin/e_main.c:755
 msgid "Setup Message System"
-msgstr ""
+msgstr "Настройка Системы Сообщений"
 
 #: src/bin/e_main.c:760
 msgid "Enlightenment cannot set up its msg system."
@@ -2542,7 +2511,7 @@ msgstr "Enlightenment не может настроить свою систему
 
 #: src/bin/e_main.c:764
 msgid "Setup DND"
-msgstr ""
+msgstr "Настройка ДНД"
 
 #: src/bin/e_main.c:769
 msgid "Enlightenment cannot set up its dnd system."
@@ -2550,43 +2519,39 @@ msgstr "Enlightenment не может настроить свою систему
 
 #: src/bin/e_main.c:773
 msgid "Setup Grab Input HAnding"
-msgstr ""
+msgstr "Настройка Обработки Метода Захвата"
 
 #: src/bin/e_main.c:778
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment не может настроить свою систему обработки захвата ввода."
 
 #: src/bin/e_main.c:782
-#, fuzzy
 msgid "Setup Modules"
-msgstr "Модули"
+msgstr "Настройка Модулей"
 
 #: src/bin/e_main.c:787
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не может настроить свою систему модулей."
 
 #: src/bin/e_main.c:791
-#, fuzzy
 msgid "Setup Color Classes"
-msgstr "Классы Цвета"
+msgstr "Настройка Цветовых Классов"
 
 #: src/bin/e_main.c:796
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не может настроить свою систему класса цветов."
 
 #: src/bin/e_main.c:800
-#, fuzzy
 msgid "Setup Gadcon"
-msgstr "Настройка Комманды"
+msgstr "Настройка Контейнера Гаджетов"
 
 #: src/bin/e_main.c:805
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment не может настроить свою систему управления гаджетами."
 
 #: src/bin/e_main.c:809
-#, fuzzy
 msgid "Setup Shelves"
-msgstr "Полки"
+msgstr "Настройка Полок"
 
 #: src/bin/e_main.c:814
 msgid "Enlightenment cannot set up its shelf system."
@@ -2594,34 +2559,31 @@ msgstr "Enlightenment не может настроить свою shelf сист
 
 #: src/bin/e_main.c:819
 msgid "Setup DPMS"
-msgstr ""
+msgstr "Настройка DPMS"
 
 #: src/bin/e_main.c:824
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment не может настроить DPMS."
 
 #: src/bin/e_main.c:828
-#, fuzzy
 msgid "Setup Screensaver"
-msgstr "Хранитель Экрана"
+msgstr "Настройка Хранителя Экрана"
 
 #: src/bin/e_main.c:833
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment не может настроить X скринсэйвер."
 
 #: src/bin/e_main.c:837
-#, fuzzy
 msgid "Setup Mouse"
-msgstr "Переход Стола Мышкой"
+msgstr "Настройка Мыши "
 
 #: src/bin/e_main.c:842
 msgid "Enlightenment cannot configure the mouse acceleration settings."
 msgstr "Enlightenment не может настроить конфигурацию ускорения мыши."
 
 #: src/bin/e_main.c:846
-#, fuzzy
 msgid "Setup Desklock"
-msgstr "Переслать на"
+msgstr "Настройка Запирания"
 
 #: src/bin/e_main.c:851
 msgid "Enlightenment cannot set up its desk locking system."
@@ -2630,26 +2592,23 @@ msgstr ""
 
 #: src/bin/e_main.c:856
 msgid "Set Up File Ordering"
-msgstr ""
+msgstr "Настроить Очередность Файлов"
 
 #: src/bin/e_main.c:860
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не может настроить свою систему очередей."
 
 #: src/bin/e_main.c:865
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "Указать Настройки Мощности ЦПУ"
+msgstr "Настроить Энергосбережение"
 
 #: src/bin/e_main.c:869
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment не может настроить свою систему подсказок."
+msgstr "Enlightenment не может настроить систему энергосбережения."
 
 #: src/bin/e_main.c:901
-#, fuzzy
 msgid "Load Modules"
-msgstr "Загрузить Модуль"
+msgstr "Загрузить Модули"
 
 #: src/bin/e_main.c:909
 msgid ""
@@ -2680,15 +2639,14 @@ msgstr ""
 "позволит Вам выбрать нужные<br> модули заново."
 
 #: src/bin/e_main.c:925
-#, fuzzy
 msgid "Configure Shelves"
-msgstr "Настроенные Полки"
+msgstr "Параметры Полок"
 
 #: src/bin/e_main.c:932
 msgid "Almost Done"
-msgstr ""
+msgstr "Почти Закончено"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2697,11 +2655,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Модуль с именем %s не был "
 "найден в<br>директориях поиска модулей.<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Ошибка загрузки модуля"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2710,11 +2668,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Полный путь до этого модуля:"
 "<br>%s<br>Сообщение ошибки:<br>%s<br>"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Модуль не содержит всех требуемых функций"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2725,12 +2683,12 @@ msgstr ""
 "минимальную версию API модулей: %i.<br>Версия API модуля объявленная для "
 "Enlightenment: %i.<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Модуль %s для Enlightenment"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Хотите выгрузить этот модуль?<br>"
 
@@ -2762,18 +2720,17 @@ msgid "Delete this Shelf"
 msgstr "Стереть эту Полку"
 
 #: src/bin/e_startup.c:62
-#, fuzzy
 msgid "Starting"
-msgstr "Запускаю %s"
+msgstr "Запускается"
 
 #: src/bin/e_sys.c:128
 msgid "Checking System Permissions"
-msgstr ""
+msgstr "Проверка Системных Разрешений"
 
 #: src/bin/e_sys.c:165 src/bin/e_sys.c:176 src/bin/e_sys.c:185
 #: src/bin/e_sys.c:194
 msgid "System Check Done"
-msgstr ""
+msgstr "Проверка Системы Закончена"
 
 #: src/bin/e_sys.c:271
 msgid "Logout problems"
@@ -2914,14 +2871,12 @@ msgid "About This Theme"
 msgstr "Об Этой Теме"
 
 #: src/bin/e_theme.c:41
-#, fuzzy
 msgid "Set As Theme"
-msgstr "Выбор Темы..."
+msgstr "Установить Как Тему"
 
 #: src/bin/e_toolbar.c:333
-#, fuzzy
 msgid "Configure Toolbar Contents"
-msgstr "Настроить Содержимое Полки"
+msgstr "Настроить Содержимое Панели"
 
 #: src/bin/e_utils.c:282
 msgid "Cannot exit - immortal windows."
@@ -3032,9 +2987,9 @@ msgstr "Добавить в Избранное"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "Каталог Вверх"
 
@@ -3071,39 +3026,39 @@ msgstr "Запрещено"
 msgid "Read-Write"
 msgstr "Чтение-Запись"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "Настройки Монитора Батареи"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Базовые Настройки"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Предупреждать при низком уровне"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Дополнительные Настройки"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Проверять батарею каждые:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
-#, fuzzy, c-format
+#: src/modules/temperature/e_mod_config.c:380
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f файлов"
+msgstr "%1.0f тиков"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Предупреждать при уровне близком к:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3114,72 +3069,51 @@ msgstr "Предупреждать при уровне близком к:"
 msgid "%1.0f minutes"
 msgstr "%1.0f мин."
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f проц."
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "Батарея"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
-"Заряд Батареи Низок<br>Заряд вашей батареи низок.<br>Вам лучше подключиться "
-"к источнику питания."
 
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
-msgstr ""
-
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "ХРЕНОВЫЙ ВОДИЛА :)"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "ПОЛНАЯ"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Высокий"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f сек."
 
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Низкий"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Опасность"
+#: src/modules/battery/e_mod_main.c:417
+msgid "Battery Meter"
+msgstr "Индикатор Батареи"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Зарядка"
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr "ОШИБКА"
 
-#: src/modules/battery/e_mod_main.c:1456
-#, fuzzy
-msgid "Battery Meter"
-msgstr "Батарея"
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr "Н/Д"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Часы"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Конфигурация Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "Элементы"
 
@@ -3210,14 +3144,13 @@ msgid "Restart Applications"
 msgstr "Перезапускаемые Приложения"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "Все Приложения"
 
 #: src/modules/conf_applications/e_int_config_apps.c:252
-#, fuzzy
 msgid "Selected Applications"
-msgstr "Указаные Приложения"
+msgstr "Выбраные Приложения"
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
@@ -3251,7 +3184,7 @@ msgstr "Выбор Границы Окна (Бордюр)"
 
 #: src/modules/conf_borders/e_int_config_borders.c:230
 msgid "Remember this Border for this window next time it appears"
-msgstr "Запомнить Бордюр для этого окна при следующих появлениях"
+msgstr "Запомнить Бордюр для этого окна на будущее"
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3268,7 +3201,7 @@ msgstr "Группировать По"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3370,7 +3303,7 @@ msgid "Error Text"
 msgstr "Текст Ошибки"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "Заголовок Меню"
 
@@ -3379,7 +3312,7 @@ msgid "Menu Title Active"
 msgstr "Активный Заголовок Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "Пункт Меню"
 
@@ -3388,12 +3321,12 @@ msgid "Menu Item Active"
 msgstr "Активный Пункт Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "Двигать Текст"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "Текст при Изменении Размера"
 
@@ -3406,12 +3339,12 @@ msgid "Winlist Label"
 msgstr "Метка Списка Окон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "Заголовок Списка Окон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Визуальные Элементы"
 
@@ -3448,7 +3381,7 @@ msgid "List Item Odd Text"
 msgstr "Дополнительный Текст Пункта в Списке"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "Заголовок Списка"
 
@@ -3534,6 +3467,7 @@ msgstr "Имя Стола"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "Имя:"
 
@@ -3575,10 +3509,10 @@ msgstr "Время превышения бездействия"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "Личный"
 
@@ -3902,36 +3836,33 @@ msgid "Power Management"
 msgstr "Управление Питанием"
 
 #: src/modules/conf_engine/e_int_config_engine.c:36
-#, fuzzy
 msgid "Engine Settings"
-msgstr "Настройки Размера"
+msgstr "Настройка Движка"
 
 #: src/modules/conf_engine/e_int_config_engine.c:86
-#, fuzzy
 msgid "Enable Composite"
-msgstr "Использовать Свои Классы Шрифта"
+msgstr "Включить Композицию"
 
 #: src/modules/conf_engine/e_int_config_engine.c:93
-#, fuzzy
 msgid "Default Engine"
-msgstr "По Умолчанию"
+msgstr "Движок по Умолчанию"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
-#, fuzzy
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
-msgstr "Использовать Свои Классы Шрифта"
+msgstr "Включить Поддержку Композиции?"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"Вы включили поддержку композиции,<br> но ваш текущий экран не поддерживает "
+"композиции.<br><br> Вы уверены, что хотите включить композиции?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
-#, fuzzy
 msgid "Engine"
-msgstr "Английский"
+msgstr "Движок"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:46
 msgid "Run Command Settings"
@@ -4046,192 +3977,197 @@ msgstr "Выравнивание Y-Координат"
 msgid "Run Command"
 msgstr "Запуск Комманды"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "Ядро"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "Пространство Заголовка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "Простой Блок Текста"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "Малый Блок Текста"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "Большой Блок Текста"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "Заголовок Конфигурационной Панели"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "Заголовок в \"Об\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "Версия в \"Об\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "Текст в \"Об\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "Заголовок в \"Запереть Экран\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "Пароль в \"Запереть Экран\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "Диалог Ошибки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Комманда Exebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Заголовок в Заставке"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "Текст в Заставке"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "Версия в Заставке"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "Запись"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "Рамка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "Метка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "Бегунок"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "Кнопки Радиобокс"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "Кнопки Чекбокс"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "Текст Пункта в Списке"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "Пункт Списка"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "Управление Файлами"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "Typebuf"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Показывать Иконки на Рабочем Столе"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "Уменьшенный Стиль"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "Обычный Стиль"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "Увеличенный Стиль"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "Настройки Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "Большой"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "Очень Большой"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d пикс."
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "Использовать Свои Классы Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Базовая Тестовая Строка: 123:"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "Классы Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "Включить Классы Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Подсказки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "Запасные Шрифты"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "Запасное Имя"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "Включить Запасные"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Разширеная Тестовая Строка... "
 
@@ -4270,7 +4206,7 @@ msgid "New"
 msgstr "Новый"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "Импорт..."
 
@@ -4321,22 +4257,64 @@ msgstr "Язык"
 msgid "Input Method Settings"
 msgstr "Настройки Метода Ввода"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Настройки Выделения"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f пикс."
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f пикс./сек"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f сек"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Встроеный"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "Настройки Языка"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "Выбор Языка"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "Выбранная Локаль"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Локаль"
 
@@ -4656,11 +4634,6 @@ msgstr "Использовать X Курсор"
 msgid "Cursor Size"
 msgstr "Размер Указателя Мыши"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f пикс."
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "Курсор Мыши"
@@ -4695,7 +4668,7 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "Темы"
 
@@ -4820,13 +4793,12 @@ msgid "Add New Profile"
 msgstr "Добавить Новый Профиль"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:276
-#, fuzzy
 msgid "Plain Profile"
-msgstr "Профили"
+msgstr "Чистый Профиль"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:280
 msgid "Clone Current Profile"
-msgstr ""
+msgstr "Клонировать Текущий Профиль"
 
 #: src/modules/conf_profiles/e_mod_main.c:22
 msgid "Profiles"
@@ -4855,11 +4827,6 @@ msgstr "Время до старта X скринсейвера"
 msgid "Time until X screensaver alternates"
 msgstr "Время до смены X скринсейвера"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f сек."
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "Затемнение"
@@ -4918,23 +4885,23 @@ msgstr "Показ Заставки при Входе"
 msgid "Startup"
 msgstr "Запуск"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Выбор Темы"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "Категории Тем"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "Назначить"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "Очистить Всё"
 
@@ -4980,38 +4947,43 @@ msgstr "Изменить Фон"
 msgid "Transitions"
 msgstr "Переходы"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "Настройки Обоев"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "Использовать Обои из Темы"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "Изображение..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "Градиент..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "Где разместить Обои"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Все Столы"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "Этот Стол"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "Этот Экран"
 
@@ -5061,7 +5033,7 @@ msgstr "Ошибка Создания Градиента"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "По какой-то причине Enlightenment не смог создать градиент."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "Выбрать Изображение..."
 
@@ -5112,17 +5084,17 @@ msgid ""
 msgstr ""
 "Enlightenment не смог импортировать изображение<br>из-за ошибок в конверсии."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "Ошибка Импорта Обоев"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment не смог импортировать обои<br>из-за ошибки копирования."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5130,6 +5102,63 @@ msgstr ""
 "Enlightenment не смог импортировать фон.<br><br>Вы уверены что это "
 "подходящий файл фона?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5323,7 +5352,7 @@ msgstr "Возвращать фокус при минимизации или з
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:216
 msgid "Slide pointer to a new focused window"
-msgstr ""
+msgstr "Перемещать указатель к новому сфокусированому окну"
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 msgid "Window Focus"
@@ -5393,7 +5422,7 @@ msgstr "Сопротивление"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:197
 msgid "Resist moving or resizing a window over an obstacle"
-msgstr "Сопротивление перемещению или изменению размеров окна при препятствии"
+msgstr "Сопротивление окна при препятствиях"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:199
 msgid "Resistance between windows:"
@@ -5419,6 +5448,62 @@ msgstr "Разрешить манипулирование окном"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Автоматически изменять окна при авто-сокрытии полки"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Запомнить Окно"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Настройка Запоминаний"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "По Умолчанию"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Имя Иконки"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Класс"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Класс"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Заголовок"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Заголовок"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Роль"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Пусто>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Настройки Списка Окон"
@@ -5492,29 +5577,24 @@ msgid "Cpufreq"
 msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:177
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Быстро (0.5 сек)"
+msgstr "Быстро (4 тика)"
 
 #: src/modules/cpufreq/e_mod_main.c:184
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Умеренно (1 сек)"
+msgstr "Умеренно (8 тиков)"
 
 #: src/modules/cpufreq/e_mod_main.c:191
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Нормально (2 сек)"
+msgstr "Нормально (32 тика)"
 
 #: src/modules/cpufreq/e_mod_main.c:198
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Медленно (5 сек)"
+msgstr "Медленно (64 тика)"
 
 #: src/modules/cpufreq/e_mod_main.c:205
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Очень Медленно (30 сек)"
+msgstr "Очень Медленно (256 тиков)"
 
 #: src/modules/cpufreq/e_mod_main.c:220
 msgid "Manual"
@@ -5674,7 +5754,7 @@ msgstr "Очень Светлая"
 
 #: src/modules/dropshadow/e_mod_main.c:90
 msgid "Dropshadow"
-msgstr ""
+msgstr "Тень"
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 msgid "Run Command Dialog"
@@ -5685,7 +5765,6 @@ msgid "Files"
 msgstr "Файл"
 
 #: src/modules/fileman/e_mod_main.c:261
-#, fuzzy
 msgid ""
 "Fileman Module Configuration data needed upgrading. Your old "
 "configuration<br>has been wiped and a new set of defaults initialized. "
@@ -5695,16 +5774,15 @@ msgid ""
 "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 ""
-"Данные конфигурации нуждались в модернизации. Ваша старая<br>конфигурация "
-"была стерта, и переписана новой. Это будет<br>происходить регулярно в "
-"течении разработки, так что не сообщайте<br>об ошибке. Это означает, что "
-"Enlightenment нуждается в новых данных<br>конфигурации по умолчанию для "
-"функциональных возможностей, в которых<br>ваша старая конфигурация просто "
-"испытывала недостаток.<br>Теперь Вы можете всё повторно настроить."
+"Данные конфигурации Файлового Менеджера нуждались в модернизации. <br>Ваша "
+"старая конфигурация была стерта, и переписана новой. <br>Это может "
+"происходить регулярно в течении разработки, так что не сообщайте об ошибке. "
+"<br>Это означает, что ФМ нуждается в новых данных конфигурации по умолчанию, "
+"для функциональных возможностей,<br>в которых ваша старая конфигурация "
+"просто испытывала недостаток.<br>Теперь Вы можете всё повторно настроить."
 "<br>Извините за икание в вашей конфигурации.<br>"
 
 #: src/modules/fileman/e_mod_main.c:274
-#, fuzzy
 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 "
@@ -5713,96 +5791,87 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Ваша конфигурация БОЛЕЕ НОВА чем Enlightenment. Это очень странно.<br>Этого "
-"не должно случаться, если только Вы не понизили Enlightenment "
-"или<br>скопировали конфигурацию с места, где была более новая версия "
-"Enlightenment.<br>Это плохо, и поэтому ваша конфигурация была восстановлена "
-"на стандартную.<br>Извините за неудобство.<br>"
+"Ваша конфигурация Файлового Менеджера БОЛЕЕ НОВА чем Enlightenment. Это "
+"очень странно.<br>Этого не должно случаться, если только Вы не понизили "
+"версию модуля ФМ или<br>скопировали конфигурацию с места, где была более "
+"новая версия ФМ.<br>Это плохо, и поэтому ваша конфигурация была "
+"восстановлена на стандартную.<br>Извините за неудобство.<br>"
 
 #: src/modules/fileman/e_mod_main.c:343
-#, fuzzy
 msgid "Fileman Configuration Updated"
-msgstr "Настройки Изменились"
+msgstr "Конфигурация Файлового Менеджера Обновлена"
 
 #: src/modules/fileman/e_mod_config.c:82
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "Настройки Размера"
+msgstr "Настройка Файлового Менеджера"
 
 #: src/modules/fileman/e_mod_config.c:159
-#, fuzzy
 msgid "Grid Icons"
-msgstr "Иконки Файлов"
+msgstr "Сетка Иконок"
 
 #: src/modules/fileman/e_mod_config.c:161
-#, fuzzy
 msgid "Custom Icons"
-msgstr "Личные"
+msgstr "Свои Иконки"
 
 #: src/modules/fileman/e_mod_config.c:163
 msgid "Custom Grid Icons"
-msgstr ""
+msgstr "Сетка Своих Иконок"
 
 #: src/modules/fileman/e_mod_config.c:166
 msgid "Custom Smart Grid Icons"
-msgstr ""
+msgstr "Умная Сетка Своих Иконок"
 
 #: src/modules/fileman/e_mod_config.c:173
-#, fuzzy
 msgid "Icon Size"
-msgstr "Имя Иконки"
+msgstr "Размер Иконки"
 
 #: src/modules/fileman/e_mod_config.c:179
 msgid "Open Dirs In Place"
-msgstr ""
+msgstr "Открывать Директории На Месте"
 
 #: src/modules/fileman/e_mod_config.c:182
 msgid "Sort Dirs First"
-msgstr ""
+msgstr "Директории Отсортированы Первыми"
 
 #: src/modules/fileman/e_mod_config.c:185
 msgid "Use Single Click"
-msgstr ""
+msgstr "Использовать Один Щелчок"
 
 #: src/modules/fileman/e_mod_config.c:188
-#, fuzzy
 msgid "Show Icon Extension"
-msgstr "Показывать Ярлык Иконки"
+msgstr "Показывать Разширения Иконок"
 
 #: src/modules/fileman/e_mod_config.c:191
 msgid "Show Full Path"
-msgstr ""
+msgstr "Показывать Полный Путь"
 
 #: src/modules/fileman/e_mod_config.c:194
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Показывать иконки на столе"
+msgstr "Показывать Иконки на Рабочем Столе"
 
 #: src/modules/fileman/e_mod_config.c:197
-#, fuzzy
 msgid "Show Toolbar"
-msgstr "Цвет Тени"
+msgstr "Показывать Панель Инструментов"
 
 #: src/modules/fileman/e_fwin.c:654
 msgid "Go to Parent Directory"
 msgstr "В Родительский Каталог"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "Открыть"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "Открыть через..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "Указаные Приложения"
 
-#: src/modules/fileman/e_fwin.c:1394
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1407
 msgid "Custom Command"
-msgstr "Запуск Комманды"
+msgstr "Своя Команда"
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:50
 #: src/modules/winlist/e_mod_main.c:63 src/modules/winlist/e_mod_main.c:64
@@ -5883,14 +5952,12 @@ msgid "Remove Icon"
 msgstr "Убрать Иконку"
 
 #: src/modules/ibar/e_mod_main.c:814
-#, fuzzy
 msgid "Add An Icon"
-msgstr "Добавить Приложение"
+msgstr "Добавить Иконку"
 
 #: src/modules/ibar/e_mod_main.c:821
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Создать Иконку"
+msgstr "Создать Новою Иконку"
 
 #: src/modules/ibar/e_mod_main.c:837
 msgid "Add Application"
@@ -5917,9 +5984,8 @@ msgid "Display Icon Name"
 msgstr "Показать Имя Иконки"
 
 #: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Показывать информацию"
+msgstr "Показывать Заголовок Окна"
 
 #: src/modules/ibox/e_mod_config.c:130
 msgid "Show windows from all screens"
@@ -5950,24 +6016,20 @@ msgid "Flip desktop on mouse wheel"
 msgstr "Переход по столам колесом мышки"
 
 #: src/modules/pager/e_mod_config.c:119 src/modules/pager/e_mod_config.c:158
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Показывать иконки на столе"
+msgstr "Показывать имена столов"
 
 #: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:198
-#, fuzzy
 msgid "Popup Settings"
-msgstr "Настройки Подсказок Пэйджера "
+msgstr "Настройка Подсказок"
 
 #: src/modules/pager/e_mod_config.c:125 src/modules/pager/e_mod_config.c:199
-#, fuzzy
 msgid "Show popup on desktop change"
-msgstr "Показать Подсказку при смене стола"
+msgstr "Показать подсказку при смене стола"
 
 #: src/modules/pager/e_mod_config.c:128
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Показывать Подсказку при срочном окне"
+msgstr "Показывать подсказку для срочных окон"
 
 #: src/modules/pager/e_mod_config.c:162
 msgid "Select and Slide button"
@@ -5981,18 +6043,16 @@ msgid "Click to set"
 msgstr "Нажать для установки"
 
 #: src/modules/pager/e_mod_config.c:169
-#, fuzzy
 msgid "Drag and Drop button"
-msgstr "Перетаскивание - кнопка"
+msgstr "Кнопка Тащи-и-Бросай"
 
 #: src/modules/pager/e_mod_config.c:176
-#, fuzzy
 msgid "Drag whole desktop"
-msgstr "Виртуальный Рабочий стол"
+msgstr "Тянуть весь рабочий стол "
 
 #: src/modules/pager/e_mod_config.c:185
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Высота подсказки ключевого действия"
 
 #: src/modules/pager/e_mod_config.c:187 src/modules/pager/e_mod_config.c:193
 #: src/modules/pager/e_mod_config.c:204
@@ -6005,14 +6065,12 @@ msgid "Resistance to dragging"
 msgstr "Сопротивление к перетаскиванию"
 
 #: src/modules/pager/e_mod_config.c:202
-#, fuzzy
 msgid "Popup pager height"
-msgstr "Скорость Подсказки"
+msgstr "Высота подсказки пэйджера "
 
 #: src/modules/pager/e_mod_config.c:207 src/modules/pager/e_mod_config.c:221
-#, fuzzy
 msgid "Popup speed"
-msgstr "Скорость Подсказки"
+msgstr "Скорость подсказки"
 
 #: src/modules/pager/e_mod_config.c:209 src/modules/pager/e_mod_config.c:223
 #, c-format
@@ -6020,14 +6078,12 @@ msgid "%1.1f seconds"
 msgstr "%1.1f сек"
 
 #: src/modules/pager/e_mod_config.c:214
-#, fuzzy
 msgid "Urgent Window Settings"
-msgstr "Настройки Списка Окон"
+msgstr "Настройки Срочного Окна"
 
 #: src/modules/pager/e_mod_config.c:215
-#, fuzzy
 msgid "Show popup on urgent window"
-msgstr "Показывать Подсказку при срочном окне"
+msgstr "Показывать подсказку на срочном окне"
 
 #: src/modules/pager/e_mod_config.c:218
 msgid "Popup on urgent window sticks on the screen"
@@ -6051,14 +6107,14 @@ msgid "Attetion"
 msgstr "Действие"
 
 #: src/modules/pager/e_mod_config.c:329
-#, 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 ""
-"Вы не можете использовать правую кнопку мыши<br>для этого, так какона уже "
-"занята внутренним<br>кодом для контекстных меню."
+"Вы не можете использовать правую кнопку мыши<br>для этого, так как она уже "
+"занята внутренним<br>кодом для контекстных меню.<br>Эта кнопка работает "
+"только в Подсказках"
 
 #: src/modules/pager/e_mod_config.c:388 src/modules/pager/e_mod_config.c:393
 #: src/modules/pager/e_mod_config.c:398
@@ -6071,31 +6127,26 @@ msgid "Virtual Desktops Configuration"
 msgstr "Настройки Виртуальных Столов"
 
 #: src/modules/pager/e_mod_main.c:2806
-#, fuzzy
 msgid "Show Pager Popup"
-msgstr "Настройки Подсказок Пэйджера "
+msgstr "Показывать Подсказку Пэйджера "
 
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2846
-#, fuzzy
 msgid "Popup Desk Right"
-msgstr "Переключить Стол Вправо"
+msgstr "Передвинуть вправо"
 
 #: src/modules/pager/e_mod_main.c:2813 src/modules/pager/e_mod_main.c:2847
-#, fuzzy
 msgid "Popup Desk Left"
-msgstr "Переключить Стол Влево"
+msgstr "Передвинуть влево"
 
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
 msgid "Popup Desk Up"
-msgstr "Переключить Стол Вверх"
+msgstr "Передвинуть вверх"
 
 #: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
 msgid "Popup Desk Down"
-msgstr "Переключить Стол Вниз"
+msgstr "Передвинуть вниз"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Пуск"
 
@@ -6103,1624 +6154,151 @@ msgstr "Пуск"
 msgid "Temperature Configuration"
 msgstr "Конфигурация Температуры"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Показывать градусы по"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Цельсию"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Фаренгейту"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Интервал Проверок"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Быстро"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Медленно"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Очень Медленно"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Высокая температура"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 Ф"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 Ф"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 Ф"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Низкая Температура"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 Ф"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 Ф"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 Ц"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 Ц"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 Ц"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 Ц"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 Ц"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Сенсоры"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f Ф"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f Ц"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "Температура"
 
 #: src/modules/wizard/e_wizard.c:341
-#, fuzzy
 msgid "Welcome to Enlightenment 東京"
-msgstr "Об Enlightenment"
+msgstr "Добро пожаловать в Enlightenment"
 
 #: src/modules/wizard/e_wizard.c:343
-#, fuzzy
 msgid "Next"
-msgstr "NetWM"
+msgstr "Далее"
 
 #: src/modules/wizard/e_wizard.c:344
-#, fuzzy
 msgid "Back"
-msgstr "Базово"
+msgstr "Назад"
 
 #: src/modules/wizard/page_010.c:25
-#, fuzzy
 msgid "Choose Language"
-msgstr "Язык"
-
-#~ msgid "NO INFO"
-#~ msgstr "НЕТ ИНФО"
-
-#~ msgid "NO BAT"
-#~ msgstr "НЕТ БАТ"
-
-#~ msgid "Application Categories"
-#~ msgstr "Категории Приложений"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Болгарский"
-
-#~ msgid "Catalan"
-#~ msgstr "Каталанский"
-
-#~ msgid "Chinese (Simplified)"
-#~ msgstr "Китайская упрощённая"
-
-#~ msgid "Chinese (Traditional)"
-#~ msgstr "Китайская традиционная"
-
-#~ msgid "Czech"
-#~ msgstr "Чешский"
-
-#~ msgid "Danish"
-#~ msgstr "Датский"
-
-#~ msgid "Dutch"
-#~ msgstr "Нидерландский"
-
-#~ msgid "English"
-#~ msgstr "Английский"
-
-#~ msgid "Finnish"
-#~ msgstr "Финский"
-
-#~ msgid "French"
-#~ msgstr "Французский"
-
-#~ msgid "German"
-#~ msgstr "Немецкий"
-
-#~ msgid "Hungarian"
-#~ msgstr "Венгерский"
-
-#~ msgid "Italian"
-#~ msgstr "Итальянский"
-
-#~ msgid "Japanese"
-#~ msgstr "Японская"
-
-#~ msgid "Korean"
-#~ msgstr "Корейская"
-
-#~ msgid "Norwegian Bokmål"
-#~ msgstr "Норвежский Букмол"
-
-#~ msgid "Polish"
-#~ msgstr "Польский"
-
-#~ msgid "Portuguese"
-#~ msgstr "Португальский"
-
-#~ msgid "Russian"
-#~ msgstr "Русский"
-
-#~ msgid "Slovak"
-#~ msgstr "Словацкий"
-
-#~ msgid "Slovenian"
-#~ msgstr "Словенский"
-
-#~ msgid "Spanish"
-#~ msgstr "Испанский"
-
-#~ msgid "Swedish"
-#~ msgstr "Шведский"
-
-#~ msgid "Afar"
-#~ msgstr "Афар"
-
-#~ msgid "Afrikaans"
-#~ msgstr "Африкаанс"
-
-#~ msgid "Akan"
-#~ msgstr "Акан"
-
-#~ msgid "Amharic"
-#~ msgstr "Амхарский (Амаринья)"
-
-#~ msgid "Aragonese"
-#~ msgstr "Арагонский"
-
-#~ msgid "Arabic"
-#~ msgstr "Арабская"
-
-#~ msgid "Assamese"
-#~ msgstr "Ассамский"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Азербайджанский"
-
-#~ msgid "Belarusian"
-#~ msgstr "Белорусский"
-
-#~ msgid "Bengali"
-#~ msgstr "Бенгальский"
-
-#~ msgid "Breton"
-#~ msgstr "Бретонский"
-
-#~ msgid "Bosnian"
-#~ msgstr "Боснийский"
-
-#~ msgid "Blin"
-#~ msgstr "Блин"
-
-#~ msgid "Atsam"
-#~ msgstr "Ацам"
-
-#~ msgid "Welsh"
-#~ msgstr "Уэльский (Валлийский)"
-
-#~ msgid "Divehi"
-#~ msgstr "Дивехи (Мальдивский)"
-
-#~ msgid "Dzongkha"
-#~ msgstr "Дзонг-кэ"
-
-#~ msgid "Ewe"
-#~ msgstr "Эве"
-
-#~ msgid "Greek"
-#~ msgstr "Греческая"
-
-#~ msgid "Esperanto"
-#~ msgstr "Эсперанто"
-
-#~ msgid "Estonian"
-#~ msgstr "Эстонский"
-
-#~ msgid "Basque"
-#~ msgstr "Баскский"
-
-#~ msgid "Persian"
-#~ msgstr "Персидская"
-
-#~ msgid "Faroese"
-#~ msgstr "Фарерский"
-
-#~ msgid "Friulian"
-#~ msgstr "Фриулианский"
-
-#~ msgid "Irish"
-#~ msgstr "Ирландский"
-
-#~ msgid "Ga"
-#~ msgstr "Га"
-
-#~ msgid "Geez"
-#~ msgstr "Геэз"
-
-#~ msgid "Galician"
-#~ msgstr "Гальский"
-
-#~ msgid "Gujarati"
-#~ msgstr "Гуджарати"
-
-#~ msgid "Manx"
-#~ msgstr "Мэнкский"
-
-#~ msgid "Hausa"
-#~ msgstr "Хауса"
-
-#~ msgid "Hawaiian"
-#~ msgstr "Гавайский"
-
-#~ msgid "Hebrew"
-#~ msgstr "Иврит"
-
-#~ msgid "Hindi"
-#~ msgstr "Хинди"
-
-#~ msgid "Croatian"
-#~ msgstr "Хорватская"
-
-#~ msgid "Armenian"
-#~ msgstr "Армянская"
-
-#~ msgid "Interlingua"
-#~ msgstr "Интерлингва"
-
-#~ msgid "Indonesian"
-#~ msgstr "Индонезийский"
-
-#~ msgid "Igbo"
-#~ msgstr "Игбо"
-
-#~ msgid "Icelandic"
-#~ msgstr "Исландская"
-
-#~ msgid "Inuktitut"
-#~ msgstr "Инуктитут"
-
-#~ msgid "Georgian"
-#~ msgstr "Грузинская"
-
-#~ msgid "Jju"
-#~ msgstr "Жжу"
-
-#~ msgid "Kamba"
-#~ msgstr "Камба"
-
-#~ msgid "Tyap"
-#~ msgstr "Тиап"
-
-#~ msgid "Koro"
-#~ msgstr "Коро"
-
-#~ msgid "Kazakh"
-#~ msgstr "Казахский"
-
-#~ msgid "Kalaallisut"
-#~ msgstr "Эскимосский"
-
-#~ msgid "Khmer"
-#~ msgstr "Кхмерский"
-
-#~ msgid "Kannada"
-#~ msgstr "Каннада"
-
-#~ msgid "Konkani"
-#~ msgstr "Конкани"
-
-#~ msgid "Kurdish"
-#~ msgstr "Курдский"
-
-#~ msgid "Cornish"
-#~ msgstr "Корнский"
-
-#~ msgid "Kirghiz"
-#~ msgstr "Киргизский"
-
-#~ msgid "Lingala"
-#~ msgstr "Лингала"
-
-#~ msgid "Lao"
-#~ msgstr "Лаосский"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Литовский"
-
-#~ msgid "Latvian"
-#~ msgstr "Латвийский"
-
-#~ msgid "Maori"
-#~ msgstr "Маори"
-
-#~ msgid "Macedonian"
-#~ msgstr "Македонский"
-
-#~ msgid "Malayalam"
-#~ msgstr "Малаялам"
-
-#~ msgid "Mongolian"
-#~ msgstr "Монгольский"
-
-#~ msgid "Marathi"
-#~ msgstr "Маратхи"
-
-#~ msgid "Malay"
-#~ msgstr "Малайский"
-
-#~ msgid "Maltese"
-#~ msgstr "Мальтийский"
-
-#~ msgid "Nepali"
-#~ msgstr "Непальский"
-
-#~ msgid "Norwegian Nynorsk"
-#~ msgstr "Норвежский Нюнорск"
-
-#~ msgid "Norwegian"
-#~ msgstr "Норвежский"
-
-#~ msgid "South Ndebele"
-#~ msgstr "Ндебеле южный"
-
-#~ msgid "Northern Sotho"
-#~ msgstr "Северное Сото"
-
-#~ msgid "Nyanja; Chichewa; Chewa"
-#~ msgstr "Чева; Чичева; Ньянджа"
-
-#~ msgid "Occitan"
-#~ msgstr "Провансальский"
-
-#~ msgid "Oromo"
-#~ msgstr "Оромо"
-
-#~ msgid "Oriya"
-#~ msgstr "Ория"
-
-#~ msgid "Punjabi"
-#~ msgstr "Пенджаби"
-
-#~ msgid "Pashto"
-#~ msgstr "Пашто"
-
-#~ msgid "Romanian"
-#~ msgstr "Руманский"
-
-#~ msgid "Kinyarwanda"
-#~ msgstr "Киньяруанда"
-
-#~ msgid "Sanskrit"
-#~ msgstr "Санскрит"
-
-#~ msgid "Northern Sami"
-#~ msgstr "Северо-саамский"
-
-#~ msgid "Serbo-Croatian"
-#~ msgstr "Сербо-Хорватский"
-
-#~ msgid "Sidamo"
-#~ msgstr "Сидама"
-
-#~ msgid "Somali"
-#~ msgstr "Сомали"
-
-#~ msgid "Albanian"
-#~ msgstr "Албанский"
-
-#~ msgid "Serbian"
-#~ msgstr "Сербский"
-
-#~ msgid "Swati"
-#~ msgstr "Свати"
-
-#~ msgid "Southern Sotho"
-#~ msgstr "Сото Южный"
-
-#~ msgid "Swahili"
-#~ msgstr "Суахили"
-
-#~ msgid "Syriac"
-#~ msgstr "Сирийский"
-
-#~ msgid "Tamil"
-#~ msgstr "Тамильский"
-
-#~ msgid "Telugu"
-#~ msgstr "Телугу"
-
-#~ msgid "Tajik"
-#~ msgstr "Таджикский"
-
-#~ msgid "Thai"
-#~ msgstr "Тайская"
-
-#~ msgid "Tigrinya"
-#~ msgstr "Тигринья"
-
-#~ msgid "Tigre"
-#~ msgstr "Тигре"
-
-#~ msgid "Tagalog"
-#~ msgstr "Тагалог"
-
-#~ msgid "Tswana"
-#~ msgstr "Тсвана"
-
-#~ msgid "Turkish"
-#~ msgstr "Турецкая"
-
-#~ msgid "Tsonga"
-#~ msgstr "Тсонга"
-
-#~ msgid "Tatar"
-#~ msgstr "Татарский"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Украинский"
-
-#~ msgid "Urdu"
-#~ msgstr "Урду"
-
-#~ msgid "Uzbek"
-#~ msgstr "Узбекский"
-
-#~ msgid "Venda"
-#~ msgstr "Венда "
-
-#~ msgid "Vietnamese"
-#~ msgstr "Вьетнамский"
-
-#~ msgid "Walloon"
-#~ msgstr "Валлун"
-
-#~ msgid "Walamo"
-#~ msgstr "Воламо"
-
-#~ msgid "Xhosa"
-#~ msgstr "Коса"
-
-#~ msgid "Yiddish"
-#~ msgstr "Идиш"
-
-#~ msgid "Yoruba"
-#~ msgstr "Йоруба"
-
-#~ msgid "Chinese"
-#~ msgstr "Китайский"
-
-#~ msgid "Zulu"
-#~ msgstr "Зулусский"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Афганистан"
-
-#~ msgid "Ã…land Islands"
-#~ msgstr "Аландские острова"
-
-#~ msgid "Albania"
-#~ msgstr "Албания"
-
-#~ msgid "Algeria"
-#~ msgstr "Алжир"
-
-#~ msgid "American Samoa"
-#~ msgstr "Американское Самоа"
-
-#~ msgid "Andorra"
-#~ msgstr "Андорра"
-
-#~ msgid "Angola"
-#~ msgstr "Ангола"
-
-#~ msgid "Anguilla"
-#~ msgstr "Ангилья"
-
-#~ msgid "Antarctica"
-#~ msgstr "Антарктида"
-
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Антигуа и Барбуда"
-
-#~ msgid "Argentina"
-#~ msgstr "Аргентина"
-
-#~ msgid "Armenia"
-#~ msgstr "Армения"
-
-#~ msgid "Aruba"
-#~ msgstr "Аруба"
-
-#~ msgid "Australia"
-#~ msgstr "Австралия"
-
-#~ msgid "Austria"
-#~ msgstr "Австрия"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Азербайджан"
-
-#~ msgid "Bahamas"
-#~ msgstr "Багамы"
-
-#~ msgid "Bahrain"
-#~ msgstr "Бахрейн"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Бангладеш"
-
-#~ msgid "Barbados"
-#~ msgstr "Барбадос"
-
-#~ msgid "Belarus"
-#~ msgstr "Беларусь"
-
-#~ msgid "Belgium"
-#~ msgstr "Бельгия"
-
-#~ msgid "Belize"
-#~ msgstr "Белиз"
-
-#~ msgid "Benin"
-#~ msgstr "Бенин"
-
-#~ msgid "Bermuda"
-#~ msgstr "Бермуды"
-
-#~ msgid "Bhutan"
-#~ msgstr "Бутан"
-
-#~ msgid "Bolivia"
-#~ msgstr "Боливия"
-
-#~ msgid "Bosnia and Herzegovina"
-#~ msgstr "Босния и Герцеговина"
-
-#~ msgid "Botswana"
-#~ msgstr "Ботсвана"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Остров Буве"
-
-#~ msgid "Brazil"
-#~ msgstr "Бразилия"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Британская территория в Индийском океане"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Бруней-Даруссалам"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Болгария"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Буркина-Фасо"
-
-#~ msgid "Burundi"
-#~ msgstr "Бурунди"
-
-#~ msgid "Cambodia"
-#~ msgstr "Камбоджа"
-
-#~ msgid "Cameroon"
-#~ msgstr "Камерун"
-
-#~ msgid "Canada"
-#~ msgstr "Канада"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Кабо-Верде"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Острова Кайман"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Центрально-Африканская Республика"
-
-#~ msgid "Chad"
-#~ msgstr "Чад"
-
-#~ msgid "Chile"
-#~ msgstr "Чили"
-
-#~ msgid "China"
-#~ msgstr "Китай"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Остров Рождества"
-
-#~ msgid "Cocos (keeling) Islands"
-#~ msgstr "Кокосовые (Килинг) острова"
-
-#~ msgid "Colombia"
-#~ msgstr "Колумбия"
-
-#~ msgid "Comoros"
-#~ msgstr "Коморы"
-
-#~ msgid "Congo"
-#~ msgstr "Конго"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Острова Кука"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Коста-Рика"
-
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Республика Кот д'Ивуар"
-
-#~ msgid "Croatia"
-#~ msgstr "Хорватия"
-
-#~ msgid "Cuba"
-#~ msgstr "Куба"
-
-#~ msgid "Cyprus"
-#~ msgstr "Кипр"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Чешская Республика"
-
-#~ msgid "Denmark"
-#~ msgstr "Дания"
-
-#~ msgid "Djibouti"
-#~ msgstr "Джибути"
-
-#~ msgid "Dominica"
-#~ msgstr "Доминика"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Доминиканская Республика"
-
-#~ msgid "Ecuador"
-#~ msgstr "Эквадор"
-
-#~ msgid "Egypt"
-#~ msgstr "Египет"
-
-#~ msgid "El Salvador"
-#~ msgstr "Сальвадор"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Экваториальная Гвинея"
-
-#~ msgid "Eritrea"
-#~ msgstr "Эритрея"
-
-#~ msgid "Estonia"
-#~ msgstr "Эстония"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Эфиопия"
-
-#~ msgid "Falkland Islands (malvinas)"
-#~ msgstr "Фолклендские (Мальвинские) острова "
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Фарерские острова"
-
-#~ msgid "Fiji"
-#~ msgstr "Фиджи"
-
-#~ msgid "Finland"
-#~ msgstr "Финляндия"
-
-#~ msgid "France"
-#~ msgstr "Франция"
-
-#~ msgid "French Guiana"
-#~ msgstr "Французская Гвиана"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Французская Полинезия"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Французские Южные территории"
-
-#~ msgid "Gabon"
-#~ msgstr "Габон"
-
-#~ msgid "Gambia"
-#~ msgstr "Гамбия"
-
-#~ msgid "Georgia"
-#~ msgstr "Грузия"
-
-#~ msgid "Germany"
-#~ msgstr "Германия"
-
-#~ msgid "Ghana"
-#~ msgstr "Гана"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Гибралтар"
-
-#~ msgid "Greece"
-#~ msgstr "Греция"
-
-#~ msgid "Greenland"
-#~ msgstr "Гренландия"
-
-#~ msgid "Grenada"
-#~ msgstr "Гренада"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Гваделупа"
-
-#~ msgid "Guam"
-#~ msgstr "Гуам"
-
-#~ msgid "Guatemala"
-#~ msgstr "Гватемала"
-
-#~ msgid "Guernsey"
-#~ msgstr "Остров Гернси"
-
-#~ msgid "Guinea"
-#~ msgstr "Гвинея"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Гвинея-Бисау"
-
-#~ msgid "Guyana"
-#~ msgstr "Гайана"
-
-#~ msgid "Haiti"
-#~ msgstr "Гаити"
-
-#~ msgid "Heard Island and Mcdonald Islands"
-#~ msgstr "Остров Херд и острова Макдональд"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Ватикан (Папский Престол)"
-
-#~ msgid "Honduras"
-#~ msgstr "Гондурас"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Гонконг"
-
-#~ msgid "Hungary"
-#~ msgstr "Венгрия"
-
-#~ msgid "Iceland"
-#~ msgstr "Исландия"
-
-#~ msgid "India"
-#~ msgstr "Индия"
-
-#~ msgid "Indonesia"
-#~ msgstr "Индонезия"
-
-#~ msgid "Iran"
-#~ msgstr "Иран"
-
-#~ msgid "Iraq"
-#~ msgstr "Ирак"
-
-#~ msgid "Ireland"
-#~ msgstr "Ирландия"
-
-#~ msgid "Isle Of Man"
-#~ msgstr "Остров Мэн"
-
-#~ msgid "Israel"
-#~ msgstr "Израиль"
-
-#~ msgid "Italy"
-#~ msgstr "Италия"
-
-#~ msgid "Jamaica"
-#~ msgstr "Ямайка"
-
-#~ msgid "Japan"
-#~ msgstr "Япония"
-
-#~ msgid "Jersey"
-#~ msgstr "Остров Джерси"
-
-#~ msgid "Jordan"
-#~ msgstr "Иордания"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Казахстан"
-
-#~ msgid "Kenya"
-#~ msgstr "Кения"
-
-#~ msgid "Kiribati"
-#~ msgstr "Кирибати"
-
-#~ msgid "Korea"
-#~ msgstr "Республика Корея"
-
-#~ msgid "Kuwait"
-#~ msgstr "Кувейт"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Киргизия"
-
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Лаосская Народно-Демократическая Республика"
-
-#~ msgid "Latvia"
-#~ msgstr "Латвия"
-
-#~ msgid "Lebanon"
-#~ msgstr "Ливан"
-
-#~ msgid "Lesotho"
-#~ msgstr "Лесото"
-
-#~ msgid "Liberia"
-#~ msgstr "Либерия"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Ливийская Арабская Джамахирия"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Лихтенштейн"
-
-#~ msgid "Lithuania"
-#~ msgstr "Литва"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Люксембург"
-
-#~ msgid "Macao"
-#~ msgstr "Макао"
-
-#~ msgid "Macedonia"
-#~ msgstr "Македония"
-
-#~ msgid "Madagascar"
-#~ msgstr "Мадагаскар"
-
-#~ msgid "Malawi"
-#~ msgstr "Малави"
-
-#~ msgid "Malaysia"
-#~ msgstr "Малайзия"
-
-#~ msgid "Maldives"
-#~ msgstr "Мальдивы"
-
-#~ msgid "Mali"
-#~ msgstr "Мали"
-
-#~ msgid "Malta"
-#~ msgstr "Мальта"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Маршалловы Острова"
-
-#~ msgid "Martinique"
-#~ msgstr "Мартиника"
-
-#~ msgid "Mauritania"
-#~ msgstr "Мавритания"
-
-#~ msgid "Mauritius"
-#~ msgstr "Маврикий"
-
-#~ msgid "Mayotte"
-#~ msgstr "Майотта"
-
-#~ msgid "Mexico"
-#~ msgstr "Мексика"
-
-#~ msgid "Micronesia"
-#~ msgstr "Федеративные штаты Микронезии"
-
-#~ msgid "Moldova"
-#~ msgstr "Молдова"
-
-#~ msgid "Monaco"
-#~ msgstr "Монако"
-
-#~ msgid "Mongolia"
-#~ msgstr "Монголия"
-
-#~ msgid "Montserrat"
-#~ msgstr "Монтсеррат"
-
-#~ msgid "Morocco"
-#~ msgstr "Марокко"
-
-#~ msgid "Mozambique"
-#~ msgstr "Мозамбик"
-
-#~ msgid "Myanmar"
-#~ msgstr "Мьянма"
-
-#~ msgid "Namibia"
-#~ msgstr "Намибия"
-
-#~ msgid "Nauru"
-#~ msgstr "Науру"
-
-#~ msgid "Nepal"
-#~ msgstr "Непал"
-
-#~ msgid "Netherlands"
-#~ msgstr "Нидерланды"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Нидерландские Антилы"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Новая Каледония"
-
-#~ msgid "New Zealand"
-#~ msgstr "Новая Зеландия"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Никарагуа"
-
-#~ msgid "Niger"
-#~ msgstr "Нигер"
-
-#~ msgid "Nigeria"
-#~ msgstr "Нигерия"
-
-#~ msgid "Niue"
-#~ msgstr "Ниуэ"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Остров Норфолк"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Северные Марианские острова"
-
-#~ msgid "Norway"
-#~ msgstr "Норвегия"
-
-#~ msgid "Oman"
-#~ msgstr "Оман"
-
-#~ msgid "Pakistan"
-#~ msgstr "Пакистан"
-
-#~ msgid "Palau"
-#~ msgstr "Палау"
-
-#~ msgid "Palestinian Territory"
-#~ msgstr "Палестинская территория"
-
-#~ msgid "Panama"
-#~ msgstr "Панама"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Папуа Новая Гвинея"
-
-#~ msgid "Paraguay"
-#~ msgstr "Парагвай"
-
-#~ msgid "Peru"
-#~ msgstr "Перу"
-
-#~ msgid "Philippines"
-#~ msgstr "Филиппины"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Питкерн"
-
-#~ msgid "Poland"
-#~ msgstr "Польша"
-
-#~ msgid "Portugal"
-#~ msgstr "Португалия"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Пуэрто-Рико"
-
-#~ msgid "Qatar"
-#~ msgstr "Катар"
-
-#~ msgid "Reunion"
-#~ msgstr "Реюньон"
-
-#~ msgid "Romania"
-#~ msgstr "Румыния"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Россия"
-
-#~ msgid "Rwanda"
-#~ msgstr "Руанда"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Святая Елена"
-
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Сен-Китс и Невис"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Сент-Люсия"
-
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Сент-Пьер и Микелон"
-
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Сент-Винсент и Гренадины"
-
-#~ msgid "Samoa"
-#~ msgstr "Самоа"
-
-#~ msgid "San Marino"
-#~ msgstr "Сан-Марино"
-
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Сан-Томе и Принсипи"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Саудовская Аравия"
-
-#~ msgid "Senegal"
-#~ msgstr "Сенегал"
-
-#~ msgid "Serbia and Montenegro"
-#~ msgstr "Сербия и Черногория"
-
-#~ msgid "Seychelles"
-#~ msgstr "Сейшелы"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Сьерра-Леоне"
-
-#~ msgid "Singapore"
-#~ msgstr "Сингапур"
-
-#~ msgid "Slovakia"
-#~ msgstr "Словакия"
-
-#~ msgid "Slovenia"
-#~ msgstr "Словения"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Соломоновы Острова"
-
-#~ msgid "Somalia"
-#~ msgstr "Сомали"
-
-#~ msgid "South Africa"
-#~ msgstr "Южная Африка"
-
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Южная Джорджия и Южные Сандвичевы острова"
-
-#~ msgid "Spain"
-#~ msgstr "Испания"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Шри-Ланка"
-
-#~ msgid "Sudan"
-#~ msgstr "Судан"
-
-#~ msgid "Suriname"
-#~ msgstr "Суринам"
-
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Шпицберген и Ян Майен"
-
-#~ msgid "Swaziland"
-#~ msgstr "Свазиленд"
-
-#~ msgid "Sweden"
-#~ msgstr "Швеция"
-
-#~ msgid "Switzerland"
-#~ msgstr "Швейцария"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Сирийская Арабская Республика"
-
-#~ msgid "Taiwan"
-#~ msgstr "Тайвань"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Таджикистан"
-
-#~ msgid "Tanzania"
-#~ msgstr "Объединенная республика Танзания"
-
-#~ msgid "Thailand"
-#~ msgstr "Таиланд"
-
-#~ msgid "Timor-Leste"
-#~ msgstr "Восточный Тимор"
-
-#~ msgid "Togo"
-#~ msgstr "Того"
-
-#~ msgid "Tokelau"
-#~ msgstr "Токелау"
-
-#~ msgid "Tonga"
-#~ msgstr "Тонга"
-
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Тринидад и Тобаго"
-
-#~ msgid "Tunisia"
-#~ msgstr "Тунис"
-
-#~ msgid "Turkey"
-#~ msgstr "Турция"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Туркмения"
-
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Острова Теркс и Кайкос"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Тувалу"
-
-#~ msgid "Uganda"
-#~ msgstr "Уганда"
-
-#~ msgid "Ukraine"
-#~ msgstr "Украина"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Объединенные Арабские Эмираты"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Великобритания (Соединенное Королевство)"
-
-#~ msgid "United States"
-#~ msgstr "Соединенные Штаты"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Малые Тихоокеанские Отдаленные острова Соединенных Штатов"
-
-#~ msgid "Uruguay"
-#~ msgstr "Уругвай"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Узбекистан"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Вануату"
-
-#~ msgid "Venezuela"
-#~ msgstr "Венесуэла"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Вьетнам"
-
-#~ msgid "Virgin Islands"
-#~ msgstr "Виргинские острова, США"
-
-#~ msgid "Wallis and Futuna"
-#~ msgstr "Уоллис и Футуна"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Западная Сахара"
-
-#~ msgid "Yemen"
-#~ msgstr "Йемен"
-
-#~ msgid "Zambia"
-#~ msgstr "Замбия"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Зимбабве"
-
-#~ msgid "Pager Settings"
-#~ msgstr "Настройки Пэйджера"
-
-#~ msgid "Drag whole desktop (Move all windows of a desktop)"
-#~ msgstr "Двигать весь стол (Двигать все окна на столе)"
-
-#~ msgid "Urgent window"
-#~ msgstr "Срочное Окно"
-
-#~ msgid "Error - Invalid Button"
-#~ msgstr "Ошибкa - Ошибочная Кнопка"
-
-#~ msgid "Unknown Data"
-#~ msgstr "Не известные Данные"
-
-#~ msgid "Enlightenment Starting. Please wait."
-#~ msgstr "Запуск Enlightenment. Пожалуйста подождите."
-
-#~ msgid "Enlightenment Battery Module"
-#~ msgstr "Модуль батареи для Enlightenment"
-
-#~ msgid ""
-#~ "A basic battery meter that uses either<hilight>ACPI</hilight> or "
-#~ "<hilight>APM</hilight><br>on Linux to monitor your battery and AC power "
-#~ "adaptor<br>status. This will work under Linux and FreeBSD and is "
-#~ "only<br>as accurate as your BIOS or kernel drivers."
-#~ msgstr ""
-#~ "Базовый измеритель уровня зарядки батареи, использующий<hilight>ACPI</"
-#~ "hilight> или <hilight>APM</hilight><br>для контроля статуса батареи и "
-#~ "статуса питания от ЭС.<br>Работает только под Linux и FreeBSD, и столь же "
-#~ "точен<br>как ваш BIOS или драйвер ядра"
-
-#~ msgid "Enlightenment Clock Module"
-#~ msgstr "Модуль часов для Enlightenment"
-
-#~ msgid "A simple module to give E17 a clock."
-#~ msgstr "Простой модуль часов в E17"
-
-#, fuzzy
-#~ msgid "Enlightenment Conf Module"
-#~ msgstr "Модуль часов для Enlightenment"
-
-#~ msgid "Enlightenment Configuration Module - Applications"
-#~ msgstr "Модуль Конфигурации Enlightenment - Приложения"
-
-#~ msgid "Configuration dialog for applications."
-#~ msgstr "Диалог конфигурации для управления приложениями."
-
-#~ msgid "Enlightenment Configuration Module - Borders"
-#~ msgstr "Модуль Конфигурации Enlightenment - Бордюры"
-
-#~ msgid "Configuration dialog for borders."
-#~ msgstr "Диалог настройки границ окон (Бордюр)."
-
-#~ msgid "Enlightenment Configuration Module - Client List Menu"
-#~ msgstr "Модуль Конфигурации Enlightenment - Меню Списка Клиентов"
-
-#~ msgid "Configuration dialog for client list menu."
-#~ msgstr "Диалог конфигурации для управления меню списка клиентов."
-
-#~ msgid "Enlightenment Configuration Module - Colors"
-#~ msgstr "Модуль Конфигурации Enlightenment - Цвета"
-
-#~ msgid "Configuration dialog for colors."
-#~ msgstr "Диалог конфигурации для управления цветом."
-
-#~ msgid "Enlightenment Configuration Module - Desk"
-#~ msgstr "Модуль Конфигурации Enlightenment - Стол"
-
-#~ msgid "Configuration dialog for desk."
-#~ msgstr "Диалог конфигурации для управления столом."
-
-#~ msgid "Enlightenment Configuration Module - Screen Lock"
-#~ msgstr "Модуль Конфигурации Enlightenment - Блокировка Экрана"
-
-#~ msgid "Configuration dialog for screen lock."
-#~ msgstr "Диалог конфигурации для управления блокировкой экрана."
-
-#~ msgid "Enlightenment Configuration Module - Virtual Desktops"
-#~ msgstr "Модуль Конфигурации Enlightenment - Виртуальные Столы"
-
-#~ msgid "Configuration dialog for virtual desktops."
-#~ msgstr "Диалог конфигурации для управления виртуальными столами."
-
-#~ msgid "Enlightenment Configuration Module - Dialogs"
-#~ msgstr "Модуль Конфигурации Enlightenment - Диалоги"
-
-#~ msgid "Configuration dialog for dialogs."
-#~ msgstr "Диалог конфигурации для управления диалогами."
-
-#~ msgid "Enlightenment Configuration Module - Screen Resolution"
-#~ msgstr "Модуль Конфигурации Enlightenment - Разрешение Экрана"
-
-#~ msgid "Configuration dialog for screen resolution."
-#~ msgstr "Диалог конфигурации для управления разрешением экрана."
-
-#~ msgid "Enlightenment Configuration Module - Power Management"
-#~ msgstr "Модуль Конфигурации Enlightenment - Управление Питанием"
-
-#~ msgid "Configuration dialog for power management."
-#~ msgstr "Диалог конфигурации для управления питанием."
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Engine"
-#~ msgstr "Модуль Конфигурации Enlightenment - Язык"
-
-#, fuzzy
-#~ msgid "Configuration dialog for engine."
-#~ msgstr "Диалог конфигурации для управления темами."
-
-#~ msgid "Enlightenment Configuration Module - Run Command"
-#~ msgstr "Модуль Конфигурации Enlightenment - Запуск Комманды"
-
-#~ msgid "Configuration dialog for run command."
-#~ msgstr "Диалог конфигурации для управления запуском комманд."
-
-#~ msgid "Enlightenment Configuration Module - Fonts"
-#~ msgstr "Модуль Конфигурации Enlightenment - Шрифты"
-
-#~ msgid "Configuration dialog for fonts."
-#~ msgstr "Диалог конфигурации для управления шрифтом."
-
-#~ msgid "Enlightenment Configuration Module - Icon Theme"
-#~ msgstr "Модуль Конфигурации Enlightenment - Тема Иконок"
-
-#~ msgid "Configuration dialog for icon theme."
-#~ msgstr "Диалог конфигурации для управления темой иконок."
-
-#~ msgid "Enlightenment Configuration Module - Input Methods"
-#~ msgstr "Модуль Конфигурации Enlightenment - Методы Ввода"
-
-#~ msgid "Configuration dialog for input methods."
-#~ msgstr "Диалог конфигурации для управления методами ввода."
-
-#~ msgid "Enlightenment Configuration Module - Language"
-#~ msgstr "Модуль Конфигурации Enlightenment - Язык"
-
-#~ msgid "Configuration dialog for language and locale."
-#~ msgstr "Диалог конфигурации для управления языком и локалью."
-
-#~ msgid "Enlightenment Configuration Module - Key Bindings"
-#~ msgstr "Модуль Конфигурации Enlightenment - Привязки Клавиатуры"
-
-#~ msgid "Configuration dialog for key bindings."
-#~ msgstr "Диалог конфигурации для управления привязками клавиатуры."
-
-#~ msgid "Enlightenment Configuration Module - Menu Settings"
-#~ msgstr "Модуль Конфигурации Enlightenment - Настройки Меню"
-
-#~ msgid "Configuration dialog for menus settings."
-#~ msgstr "Диалог конфигурации для управления настройками меню."
-
-#~ msgid "Enlightenment Configuration Module - File Icons"
-#~ msgstr "Модуль Конфигурации Enlightenment - Иконки Файлов"
-
-#~ msgid "Configuration dialog for file icons."
-#~ msgstr "Диалог конфигурации для управления иконками файлов."
-
-#~ msgid "Enlightenment Configuration Module - Mouse Bindings"
-#~ msgstr "Модуль Конфигурации Enlightenment - Привязки Мыши"
-
-#~ msgid "Configuration dialog for mouse bindings."
-#~ msgstr "Диалог конфигурации для управления привязками мыши."
-
-#~ msgid "Enlightenment Configuration Module - Mouse Cursor"
-#~ msgstr "Модуль Конфигурации Enlightenment - Курсор Мыши"
-
-#~ msgid "Configuration dialog for mouse cursor."
-#~ msgstr "Диалог конфигурации для управления курсором мыши."
-
-#~ msgid "Enlightenment Configuration Module - Mouse Acceleration"
-#~ msgstr "Модуль Конфигурации Enlightenment - Ускорение Мыши"
-
-#~ msgid "Configuration dialog for mouse acceleration."
-#~ msgstr "Диалог конфигурации для управления скоростью мыши."
-
-#~ msgid "Enlightenment Configuration Module - Search Directories"
-#~ msgstr "Модуль Конфигурации Enlightenment - Папки Поиска"
-
-#~ msgid "Configuration dialog for search directories."
-#~ msgstr "Диалог конфигурации для управления поиском в папках."
-
-#~ msgid "Enlightenment Configuration Module - Performance"
-#~ msgstr "Модуль Конфигурации Enlightenment - Производительность"
-
-#~ msgid "Configuration dialog for performance."
-#~ msgstr "Диалог конфигурации для управления производительностью."
-
-#~ msgid "Enlightenment Configuration Module - Profiles"
-#~ msgstr "Модуль Конфигурации Enlightenment - Профили"
-
-#~ msgid "Configuration dialog for config profiles."
-#~ msgstr "Диалог конфигурации для управления профилями."
-
-#~ msgid "Enlightenment Configuration Module - Screen Saver"
-#~ msgstr "Модуль Конфигурации Enlightenment - Хранитель Экрана"
-
-#~ msgid "Configuration dialog for screen saver."
-#~ msgstr "Диалог конфигурации для управления хранителем экрана."
-
-#~ msgid "Enlightenment Configuration Module - Shelves"
-#~ msgstr "Модуль Конфигурации Enlightenment - Полки"
-
-#~ msgid "Configuration dialog for shelves."
-#~ msgstr "Диалог конфигурации для управления полками."
-
-#~ msgid "Enlightenment Configuration Module - Startup"
-#~ msgstr "Модуль Конфигурации Enlightenment - Запуск"
-
-#~ msgid "Configuration dialog for startup."
-#~ msgstr "Диалог конфигурации для управления запуском."
-
-#~ msgid "Enlightenment Configuration Module - Theme"
-#~ msgstr "Модуль Конфигурации Enlightenment - Тема"
-
-#~ msgid "Configuration dialog for theme."
-#~ msgstr "Диалог конфигурации для управления темами."
-
-#~ msgid "Enlightenment Configuration Module - Transitions"
-#~ msgstr "Модуль Конфигурации Enlightenment - Переходы"
-
-#~ msgid "Configuration dialog for transitions."
-#~ msgstr "Диалог конфигурации для управления переходами."
-
-#~ msgid "Enlightenment Configuration Module - Wallpaper"
-#~ msgstr "Модуль Конфигурации Enlightenment - Обои"
-
-#~ msgid "Configuration dialog for wallpaper configuration."
-#~ msgstr "Диалог конфигурации для управления обоями."
-
-#~ msgid "Enlightenment Configuration Module - Window Display"
-#~ msgstr "Модуль Конфигурации Enlightenment - Показ Окна"
-
-#~ msgid "Configuration dialog for window display."
-#~ msgstr "Диалог конфигурации для управления показом окна."
-
-#~ msgid "Enlightenment Configuration Module - Window Focus"
-#~ msgstr "Модуль Конфигурации Enlightenment - Фокус Окна"
-
-#~ msgid "Configuration dialog for window focus."
-#~ msgstr "Диалог конфигурации для управления фокусом окна."
-
-#~ msgid "Enlightenment Configuration Module - Window Manipulation"
-#~ msgstr "Модуль Конфигурации Enlightenment - Управление Окнами"
-
-#~ msgid "Configuration dialog for window manipulation."
-#~ msgstr "Диалог конфигурации для управления окнами."
-
-#~ msgid "Enlightenment Configuration Module - Window List"
-#~ msgstr "Модуль Конфигурации Enlightenment - Список Окон"
-
-#~ msgid "Configuration dialog for window list."
-#~ msgstr "Диалог конфигурации для управления списком окон."
-
-#~ msgid "CPU Frequency Controller Module"
-#~ msgstr "Модуль Контоля Частоты ЦПУ"
-
-#~ msgid ""
-#~ "A simple module to control the frequency of the system CPU.<br>This is "
-#~ "especially useful to save power on laptops."
-#~ msgstr ""
-#~ "Простой модуль контоля частоты центрального процессора.<br>Очень полезен "
-#~ "на портативных компьютерах."
-
-#~ msgid "Enlightenment Dropshadow Module"
-#~ msgstr "Модуль тени для Enlightenment"
-
-#~ msgid ""
-#~ "This is the dropshadow module that allows dropshadows to be cast<br>on "
-#~ "the desktop background - without special X-Server extensions<br>or "
-#~ "hardware acceleration."
-#~ msgstr ""
-#~ "Это модуль тени, позволяющий отбрасывать тень<br>на рабочий стол без "
-#~ "специальных расширений X-Server<br>или аппаратной акселерации."
-
-#, fuzzy
-#~ msgid "Enlightenment Exebuf Module"
-#~ msgstr "Модуль IBox для Enlightenment"
-
-#, fuzzy
-#~ msgid "Enlightenment File Manager"
-#~ msgstr "Модуль %s для Enlightenment"
-
-#, fuzzy
-#~ msgid "Enlightenment Winlist Module"
-#~ msgstr "Модуль %s для Enlightenment"
-
-#~ msgid "Enlightenment IBar Module"
-#~ msgstr "Модуль IBar для Enlightenment"
-
-#~ msgid ""
-#~ "This is the IBar Application Launcher bar module for Enlightenment.<br>It "
-#~ "is a first example module and is being used to flesh out "
-#~ "several<br>interfaces in Enlightenment 0.17.0. It is under heavy "
-#~ "development,<br>so expect it to <hilight>break often</hilight> and change "
-#~ "as it improves."
-#~ msgstr ""
-#~ "Это - прикладной модуль Запуска Приложений IBar для Enlightenment.<br>Это "
-#~ "- первый модуль примера и используется, чтобы изложить в деталях "
-#~ "несколько <br>интерфейсов в Enlightenment 0.17.0. Модуль находится под "
-#~ "усиленной разработкой,<br>поэтому ожидайте, что он <hilight> часто "
-#~ "ломается</hilight>, изменяется, и улучшается."
-
-#~ msgid "Enlightenment IBox Module"
-#~ msgstr "Модуль IBox для Enlightenment"
-
-#~ msgid ""
-#~ "This is the IBox Iconified Application module for Enlightenment.<br>It "
-#~ "will hold minimized applications"
-#~ msgstr ""
-#~ "Это модуль Свернутых Приложений IBox для Enlightenment.<br>Он будет "
-#~ "держать свернутые приложения"
-
-#~ msgid "Enlightenment Layout Module"
-#~ msgstr "Модуль Расположения Enlightenment"
+msgstr "Выбор Языка"
 
 #~ msgid ""
-#~ "Can restrict or implement specific window layout policies for specialised "
-#~ "situations."
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
 #~ msgstr ""
-#~ "Может ограничить или осуществить определенную политику расположения окна "
-#~ "для специализированных ситуаций."
-
-#~ msgid "Enlightenment Pager Module"
-#~ msgstr "Модуль Пейджер для Enlightenment"
+#~ "Заряд Батареи Низок<br>Заряд вашей батареи низок.<br>Вам лучше "
+#~ "подключиться к источнику питания."
 
-#~ msgid "A pager module to navigate virtual desktops."
-#~ msgstr "Модуль пейджера для переключения виртуальных рабочих столов."
+#~ msgid "BAD DRIVER"
+#~ msgstr "ХРЕНОВЫЙ ВОДИЛА :)"
 
-#~ msgid "Enlightenment Start Module"
-#~ msgstr "Модуль Запуска для Enlightenment"
+#~ msgid "FULL"
+#~ msgstr "ПОЛНАЯ"
 
-#~ msgid "Experimental Button module for E17"
-#~ msgstr "Экспериментальный модуль Кнопки Запуска для E17"
+#~ msgid "High"
+#~ msgstr "Высокий"
 
-#~ msgid "Enlightenment Temperature Module"
-#~ msgstr "Модуль Температуры для Enlightenment"
-
-#~ msgid ""
-#~ "A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux."
-#~ "<br>It is especially useful for modern Laptops with high speed<br>CPUs "
-#~ "that generate a lot of heat."
-#~ msgstr ""
-#~ "Модуль для измерения <hilight>теплового датчика ACPI</hilight> на Linux."
-#~ "<br>Особенно полезен для современных портативных компьютеров с высокой "
-#~ "скоростью<br>ЦПУ, которые производят большую температуру."
-
-#, fuzzy
-#~ msgid "Enlightenment First Run Wizard Module"
-#~ msgstr "Модуль Запуска для Enlightenment"
+#~ msgid "Low"
+#~ msgstr "Низкий"
 
-#~ msgid "Enlightenment cannot set up its window list system."
-#~ msgstr "Enlightenment не может настроить свою систему списка окон."
+#~ msgid "Danger"
+#~ msgstr "Опасность"
 
-#~ msgid "Enlightenment cannot set up its exebuf system."
-#~ msgstr "Enlightenment не может настроить свою exebuf систему."
+#~ msgid "Charging"
+#~ msgstr "Зарядка"
diff --git a/po/sl.gmo b/po/sl.gmo
index e7d8471..a8576e8 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index d860a95..ac24c64 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2006-03-21 02:50+0100\n"
 "Last-Translator: Perat Tomaž <pithlit at gmail.com>\n"
 "Language-Team:  <pithlit at gmail.com>\n"
@@ -17,8 +17,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -64,15 +64,15 @@ msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "Da"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "Ne"
 
@@ -144,368 +144,368 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 #, fuzzy
 msgid "Window : Actions"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 #, fuzzy
 msgid "Move"
 msgstr "Jaz"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 #, fuzzy
 msgid "Resize"
 msgstr "Upor"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "Meni"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 #, fuzzy
 msgid "Window Menu"
 msgstr "Vloga Okna"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 #, fuzzy
 msgid "Lower"
 msgstr "Nizko"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "Zapri"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "Uniči"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 #, fuzzy
 msgid "Window : State"
 msgstr "Ime Okna"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Celozaslonsko stanje"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "Maksimiraj"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 #, fuzzy
 msgid "Maximize Vertically"
 msgstr "Maksimirano po vertikali"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 #, fuzzy
 msgid "Maximize Horizontally"
 msgstr "Maksimirano po horizontali"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 #, fuzzy
 msgid "Maximize Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 #, fuzzy
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimirano stanje"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "Taktika Maksimiranja"
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 #, fuzzy
 msgid "Toggle Borderless State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 #, fuzzy
 msgid "Flip Desktop Left"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 #, fuzzy
 msgid "Flip Desktop Right"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 #, fuzzy
 msgid "Flip Desktop Down"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 #, fuzzy
 msgid "Flip Desktop By..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 #, fuzzy
 msgid "Show The Desktop"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 #, fuzzy
 msgid "Flip Desktop To..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 #, fuzzy
 msgid "Switch To Desktop 0"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 #, fuzzy
 msgid "Switch To Desktop 1"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 #, fuzzy
 msgid "Switch To Desktop 2"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 #, fuzzy
 msgid "Switch To Desktop 3"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 #, fuzzy
 msgid "Switch To Desktop 4"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 #, fuzzy
 msgid "Switch To Desktop 5"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 #, fuzzy
 msgid "Switch To Desktop 6"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 #, fuzzy
 msgid "Switch To Desktop 7"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 #, fuzzy
 msgid "Switch To Desktop 8"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 #, fuzzy
 msgid "Switch To Desktop 9"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 #, fuzzy
 msgid "Switch To Desktop 10"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 #, fuzzy
 msgid "Switch To Desktop 11"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 #, fuzzy
 msgid "Switch To Desktop..."
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -516,151 +516,151 @@ msgstr "Pošlji na namizje"
 msgid "Screen"
 msgstr "Zakleni zaslon"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 #, fuzzy
 msgid "Window : Moving"
 msgstr "Zasenčevanje oken"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 #, fuzzy
 msgid "To Next Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 #, fuzzy
 msgid "To Previous Desktop"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 #, fuzzy
 msgid "By Desktop #..."
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 #, fuzzy
 msgid "To Desktop..."
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 #, fuzzy
 msgid "Show Main Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 #, fuzzy
 msgid "Show Favorites Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 #, fuzzy
 msgid "Show All Applications Menu"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 #, fuzzy
 msgid "Show Clients Menu"
 msgstr "Prikaži Komentar v Meniju"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 #, fuzzy
 msgid "Show Menu..."
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 #, fuzzy
 msgid "Defined Command"
 msgstr "Poženi ukaz"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 #, fuzzy
 msgid "Application"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 #, fuzzy
 msgid "Exit"
 msgstr "Počakaj z izhodom"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr ""
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 #, fuzzy
 msgid "Suspend to Disk"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 #, fuzzy
 msgid "Desktop Lock"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "Razporedi Okna"
 
@@ -669,12 +669,12 @@ msgstr "Razporedi Okna"
 msgid "Set As Background"
 msgstr "Nastavi Ozadje za"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Desktop"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Desktop"
@@ -716,11 +716,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "Desktop"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "Nastavitve Osvežene"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -728,7 +728,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -738,7 +738,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -747,7 +747,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -756,7 +756,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -764,18 +764,17 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Nastavitev Enlightenment"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -784,19 +783,20 @@ msgstr "Nastavitev Enlightenment"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "V Redu"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -812,14 +812,14 @@ msgstr "Uporabi"
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "Moduli"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "Območje %d"
@@ -880,7 +880,7 @@ msgid "Desktop Entry Editor"
 msgstr ""
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
@@ -918,7 +918,7 @@ msgstr "Splošni podatki"
 msgid "Window Class"
 msgstr "Razred Okna"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr ""
@@ -969,6 +969,7 @@ msgstr "Izberi okno"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "Pozabi"
 
@@ -977,7 +978,7 @@ msgstr "Pozabi"
 msgid "Select an Executable"
 msgstr "Izberi okno"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -985,16 +986,16 @@ msgstr "Izberi okno"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 #, fuzzy
 msgid "Cut"
 msgstr "Odreži"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 #, fuzzy
 msgid "Paste"
 msgstr "Hitro"
@@ -1004,24 +1005,24 @@ msgstr "Hitro"
 msgid "Select All"
 msgstr "Izbriši"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "Napaka pri zagonu"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, 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_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "Napaka pri pogonu programa"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1030,201 +1031,201 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "zagnal."
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "Napaka pri zagonu programa"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s se je nepričakovano zaustavil"
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, fuzzy, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Izhodna koda %i je bila vrnjena zaradi %s"
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, fuzzy, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je bil prekinjen z \"Interrupt\" signalom"
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, fuzzy, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je bil prekinjen s \"Quit\" signalom"
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, fuzzy, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je bil prekinjen z \"Abort\" signalom"
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, fuzzy, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s je bil prekinjen z napako plavajoče vejice \"Floating Point Error\""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, fuzzy, 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:447
+#: src/bin/e_exec.c:452
 #, fuzzy, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s je bil prekinjen s segmentacijsko napako \"Segmentation Fault\""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, fuzzy, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s je bil prekinjen s prekinjeno cevjo \"Broken Pipe\""
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, fuzzy, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je bil prekinjen s \"Termination\" signalom"
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, fuzzy, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s je bil prekinjen z napako vodila \"Bus Error\""
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, fuzzy, 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:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "Zapisniki Napak"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "Ni bilo poročila o napaki"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "Shrani to sporočilo"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "Informacija o napaki"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "Informacija o napaki signala"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "Izhodni podatki"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "Ni bilo izhodnih podatkov"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, fuzzy, c-format
 msgid "%i Files"
 msgstr "%1.0f files"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "Urejevalni Način"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 #, fuzzy
 msgid "Refresh View"
 msgstr "Stopnja osveževanja"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 #, fuzzy
 msgid "Remember Ordering"
 msgstr "Zapomni si uporabo"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 #, fuzzy
 msgid "New Directory"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "Ikone"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 #, fuzzy
 msgid "New Directory Name:"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, fuzzy, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 #, fuzzy
 msgid "Rename File"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Potrdi"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, fuzzy, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ste prepričani, da hočete pobrisati <br><b>%s</b> ?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1281,7 +1282,7 @@ msgid "Owner can write"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1318,50 +1319,50 @@ msgstr "Informacija o napaki"
 msgid "Select an Image"
 msgstr "Izberi okno"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Neznan"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 #, fuzzy
 msgid "Inset"
 msgstr "Ikone"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1375,27 +1376,27 @@ msgstr "Ikone"
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1422,7 +1423,7 @@ msgid ""
 "init<br>splash theme that is correctly made or fix the<br>one you use."
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "Zaklepi Oken"
 
@@ -1456,21 +1457,21 @@ msgid "Lock program changing:"
 msgstr "Prepreči programu spreminjanje:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "Pozicija"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "Velikost"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "Razvrščanje"
 
@@ -1479,12 +1480,12 @@ msgid "Iconified state"
 msgstr "Minimirano stanje"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "Lepljivost"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "Zasenčenost"
 
@@ -1500,7 +1501,7 @@ msgstr "Celozaslonsko stanje"
 msgid "Lock me from changing:"
 msgstr "Prepreči mi spreminjati:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "Stil Okvirjev"
 
@@ -1520,137 +1521,137 @@ msgstr "Izhod iz seje s tem oknom odprtim"
 msgid "Remember these Locks"
 msgstr "Zapomni si te zaklepe"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "Vedno na vrhu"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "Vedno spodaj"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 #, fuzzy
 msgid "Maximize vertically"
 msgstr "Maksimirano po vertikali"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 #, fuzzy
 msgid "Maximize horizontally"
 msgstr "Maksimirano po horizontali"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 #, fuzzy
 msgid "Unmaximize"
 msgstr "Maksimiraj"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Okvir"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 #, fuzzy
 msgid "Pin to Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 #, fuzzy
 msgid "Unpin from Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "Uredi ikono"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 #, fuzzy
 msgid "Add To Favorites Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "Ustvari ikono"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 #, fuzzy
 msgid "Window Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "Minimiraj"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Stil Okvirjev"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Uporabi privzeto programsko ikono"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Ustvari ikono"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Zasenči"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Prilepi"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 #, fuzzy
 msgid "Window List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1660,6 +1661,10 @@ msgstr "Seznam Oken"
 msgid "Pager"
 msgstr "Nevarno"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr ""
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1673,7 +1678,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "Naslov"
 
@@ -1784,11 +1789,11 @@ msgstr "Lastnosti"
 msgid "Modal"
 msgstr "Moduli"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 #, fuzzy
 msgid "Skip Pager"
 msgstr "Nevarno"
@@ -1797,15 +1802,15 @@ msgstr "Nevarno"
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "Zapomni si lasnosti Okna"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "Lastnosti Okna se ne ujemajo popolno"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1828,11 +1833,11 @@ msgstr ""
 "Redu</hilight><br>in vaše nastavitve bodo potrjene. V nasprotnem primeru "
 "pritisnite gumb <hilight>Pozabi</hilight>."
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "Ni ujemajočih se lastnosti"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1844,7 +1849,7 @@ msgstr ""
 "kakšen način</hilight>.<br><br>Podati morate vsaj en način, kako naj si "
 "Enlightenment zaponi to Okno."
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1873,125 +1878,125 @@ msgstr ""
 "nastavitve bodo potrjene. V nasprotnem primeru pritisnite gumb "
 "<hilight>Pozabi</hilight>."
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "Velikost in Lokacija"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "Zaklepi"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "Velikost, Lokacija in Zaklepi"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "Zapomni si uporabo"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "Ime in Razred Okna"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "Vloga Okna"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "Tip Okna"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr "Prehodnost"
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "Zapomni si Lastnosti"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "Navidezno Namizje"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 #, fuzzy
 msgid "Current Screen"
 msgstr "Zaslonsko Območje"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "Preskoči seznam oken"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "Zapomni si le eno Okno"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 #, fuzzy
 msgid "Start this program on login"
 msgstr "Obnovi ločljivost pri vstopu v sistem"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "Preizkusi upravljalnika z datotekami"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "Nastavitve Modulov"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 #, fuzzy
 msgid "Available Modules"
 msgstr "Priljubljeni programi"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 #, fuzzy
 msgid "Load Module"
 msgstr "(Ni naloženih modulov)"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "(Ni naloženih modulov)"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 #, fuzzy
 msgid "Unload Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2063,10 +2068,12 @@ msgstr "Priljubljeni programi"
 msgid "Applications"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "Okna"
 
@@ -2094,53 +2101,53 @@ msgstr ""
 msgid "Show/Hide All Windows"
 msgstr "Prikaži minimirana okna"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 #, fuzzy
 msgid "Configure Virtual Desktops"
 msgstr "Navidezno Namizje"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "Zakleni zaslon"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(Ni Oken)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "Izgubljena Okna"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "Ni Imena!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 #, fuzzy
 msgid "Delete A Shelf"
 msgstr "Izbriši"
@@ -2151,13 +2158,13 @@ msgid "Shelf Configuration"
 msgstr "Nastavitve"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
@@ -2166,12 +2173,12 @@ msgid "Medium"
 msgstr "Srednje"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
@@ -2214,7 +2221,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f pikslov"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr ""
 
@@ -2774,7 +2781,7 @@ msgstr "Nastavitve"
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2783,11 +2790,11 @@ msgstr ""
 "Pri zagonu modula %s je prišlo do napake.<br>Modul z imenom %s ni bil najden "
 "v<br>mapah z moduli."
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2796,11 +2803,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:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "Modul ne vsebuje vseh potrebnih funkcij."
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2810,12 +2817,12 @@ msgstr ""
 "Napaka v Module API<br>Napaka pri zaginu modula: %s<br>Potrebuje najmanj "
 "Module API verzije: %i<br>Enlightenment poroča Module API verzije: %i.<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "Bi radi razbremenili ta modul?<br>"
 
@@ -3108,9 +3115,9 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 #, fuzzy
 msgid "Go up a Directory"
 msgstr "Mapa"
@@ -3149,40 +3156,40 @@ msgstr ""
 msgid "Read-Write"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 #, fuzzy
 msgid "Battery Monitor Configuration"
 msgstr "Nastavitev Baterije"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "Osnovne nastavitve"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "Napredne nastavitve"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "Preveri baterijo vsake:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f files"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "Prikaži obvestilo ko je baterije še za:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3193,73 +3200,53 @@ msgstr "Prikaži obvestilo ko je baterije še za:"
 msgid "%1.0f minutes"
 msgstr "%1.0f minut"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, fuzzy, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f sekund"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
-"Prazna Baterija<br>Vaša baterija je skoraj prazna.<br>Mogoče bi bilo pametno "
-"preklopiti na omrežje?"
 
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
-msgstr ""
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f sekund"
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "SLAB GONILNIK"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "POLNA"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "Visoko"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "Nizko"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "Nevarno"
-
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "Polnjenje"
-
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Preveri baterijo vsake:"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 #, fuzzy
 msgid "Clock"
 msgstr "Zaklepi"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Nastavitev Enlightenment"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3294,7 +3281,7 @@ msgid "Restart Applications"
 msgstr "Priljubljeni programi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 #, fuzzy
 msgid "All Applications"
 msgstr "(Ni Programov)"
@@ -3359,7 +3346,7 @@ msgstr "Skupina:"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3470,7 +3457,7 @@ msgid "Error Text"
 msgstr "Napaka"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 #, fuzzy
 msgid "Menu Title"
 msgstr "Naslov"
@@ -3480,7 +3467,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 #, fuzzy
 msgid "Menu Item"
 msgstr "Meni"
@@ -3490,12 +3477,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr ""
 
@@ -3509,13 +3496,13 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 #, fuzzy
 msgid "Winlist Title"
 msgstr "Naslov Okna"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 #, fuzzy
 msgid "Widgets"
 msgstr "Pripomočki"
@@ -3553,7 +3540,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr ""
 
@@ -3649,6 +3636,7 @@ msgstr "Desktop"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 #, fuzzy
 msgid "Name:"
 msgstr "Po imenu"
@@ -3695,10 +3683,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 #, fuzzy
 msgid "Personal"
 msgstr "Dovoljenja:"
@@ -4052,12 +4040,12 @@ msgstr "Razred Ikone"
 msgid "Default Engine"
 msgstr "Privzeto Namizje"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -4184,211 +4172,216 @@ msgstr "Naravnaj po Y-osi"
 msgid "Run Command"
 msgstr "Poženi ukaz"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "Zapri"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 #, fuzzy
 msgid "Title Bar"
 msgstr "Naslov"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 #, fuzzy
 msgid "Configure Heading"
 msgstr "Nastavitve"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 #, fuzzy
 msgid "About Title"
 msgstr "O tej temi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 #, fuzzy
 msgid "About Text"
 msgstr "O"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 #, fuzzy
 msgid "Desklock Password"
 msgstr "Prikaži geslo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 #, fuzzy
 msgid "Exebuf Command"
 msgstr "Poženi ukaz"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 #, fuzzy
 msgid "Frame"
 msgstr "\"Framerate\""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 #, fuzzy
 msgid "Buttons"
 msgstr "Spodaj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 #, fuzzy
 msgid "Slider"
 msgstr "Velikost"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "Preizkusi upravljalnika z datotekami"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 #, fuzzy
 msgid "Typebuf"
 msgstr "Tip:"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "Prikaži ime namizja"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 #, fuzzy
 msgid "Normal Styled"
 msgstr "Normalno"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 #, fuzzy
 msgid "Font Settings"
 msgstr "Nastavitve Fokusa"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, fuzzy, c-format
 msgid "%d pixels"
 msgstr "%1.0f pikslov"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 #, fuzzy
 msgid "Enable Custom Font Classes"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 #, fuzzy
 msgid "Fonts"
 msgstr "Ikone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 #, fuzzy
 msgid "Font Classes"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 #, fuzzy
 msgid "Hinting"
 msgstr "Brez Mehčanja"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 #, fuzzy
 msgid "Bytecode"
 msgstr "\"Bytecode\" Mehčanje"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "Avtomatsko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -4433,7 +4426,7 @@ msgid "New"
 msgstr "Novo"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr ""
 
@@ -4492,24 +4485,66 @@ msgstr "Upravitelj"
 msgid "Input Method Settings"
 msgstr "Napaka pri metodi vnosa"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "Namestitev izbire"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f pikslov"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f pikslov/sek"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f sek"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Pod oknom"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 #, fuzzy
 msgid "Language Configuration"
 msgstr "Nastavitev Namizja"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 #, fuzzy
 msgid "Language Selector"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr ""
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 #, fuzzy
 msgid "Locale"
 msgstr "Zaklep neuspešen"
@@ -4852,11 +4887,6 @@ msgstr "Uporabi X kazalec"
 msgid "Cursor Size"
 msgstr "Velikost kazalca"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f pikslov"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 #, fuzzy
 msgid "Mouse Cursor"
@@ -4897,7 +4927,7 @@ msgid "Images"
 msgstr "Razporedi sliko"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr ""
 
@@ -5069,11 +5099,6 @@ msgstr "ÄŒas do zagona ohranjevalnika zaslona"
 msgid "Time until X screensaver alternates"
 msgstr "ÄŒas do zagona ohranjevalnika zaslona"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekund"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 #, fuzzy
 msgid "Blanking"
@@ -5138,25 +5163,25 @@ msgstr "Prikaži začetno animacijo"
 msgid "Startup"
 msgstr "Ostro"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 #, fuzzy
 msgid "Clear"
 msgstr "Blizu"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 #, fuzzy
 msgid "Clear All"
 msgstr "Izbriši"
@@ -5205,39 +5230,44 @@ msgstr "Nastavitve Ozadij"
 msgid "Transitions"
 msgstr "Prehodnost"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 #, fuzzy
 msgid "Wallpaper Settings"
 msgstr "Nastavitve Ovijanja"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "Vsa Namizja"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "To Namizje"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 #, fuzzy
 msgid "This Screen"
 msgstr "Zakleni zaslon"
@@ -5292,7 +5322,7 @@ msgstr "Napaka pri zagonu programa"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr ""
 
@@ -5351,12 +5381,12 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "zagnal."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 #, fuzzy
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
@@ -5364,12 +5394,69 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "zagnal."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5669,6 +5756,62 @@ msgstr "Rokovanje z Okni"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Avtomatsko privzdigni Okno pri prehodu s kazalcem"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "Zapomni si lasnosti Okna"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "Zapomni si"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "Privzeto Namizje"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "Velikost ikon"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "Celzij"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "Razred Ikone"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "Naslov"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "Naslov"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "Datoteka:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<Nič>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Nastavitve Seznama Oken"
@@ -6043,20 +6186,20 @@ msgstr "Prikaži sledilnik"
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 #, fuzzy
 msgid "Specific Applications"
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "Poženi ukaz"
@@ -6372,7 +6515,7 @@ msgstr "Vsa Namizja"
 msgid "Popup Desk Down"
 msgstr "To Namizje"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 #, fuzzy
 msgid "Start"
 msgstr "Zaganjam %s"
@@ -6381,111 +6524,111 @@ msgstr "Zaganjam %s"
 msgid "Temperature Configuration"
 msgstr "Nastavitev Temperature"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "Prikaži enote"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "Celzij"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "Nastavi interval"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "Hitro"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "Počasi"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "Zelo počasi"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "Visoka temperatura"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "Nizka temperatura"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "Tipala"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 #, fuzzy
 msgid "Temperature"
 msgstr "Nizka temperatura"
@@ -6509,6 +6652,31 @@ msgstr "Osnovno"
 msgid "Choose Language"
 msgstr "Upravitelj"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Prazna Baterija<br>Vaša baterija je skoraj prazna.<br>Mogoče bi bilo "
+#~ "pametno preklopiti na omrežje?"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "SLAB GONILNIK"
+
+#~ msgid "FULL"
+#~ msgstr "POLNA"
+
+#~ msgid "High"
+#~ msgstr "Visoko"
+
+#~ msgid "Low"
+#~ msgstr "Nizko"
+
+#~ msgid "Danger"
+#~ msgstr "Nevarno"
+
+#~ msgid "Charging"
+#~ msgstr "Polnjenje"
+
 #~ msgid "NO INFO"
 #~ msgstr "BREZ PODATKA"
 
@@ -7167,9 +7335,6 @@ msgstr "Upravitelj"
 #~ msgid "Window Title"
 #~ msgstr "Naslov Okna"
 
-#~ msgid "Icon Class"
-#~ msgstr "Razred Ikone"
-
 #~ msgid "Misc"
 #~ msgstr "Različno"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index d157531..2243732 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1212052..ee65e31 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2008-01-15 19:34+0800\n"
 "Last-Translator: gao stone <gaoghy at gmail.com>\n"
 "Language-Team: Emfox Zhou <EmfoxZhou at gmail.com>\n"
@@ -18,8 +18,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "关于 Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -63,15 +63,15 @@ msgstr "您确定要退出吗?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "是"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "否"
 
@@ -130,145 +130,145 @@ msgid ""
 "suspend to disk?"
 msgstr "您要求休眠计算机。<br><br>您确定吗?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "窗口:动作"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "改变大小"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "菜单"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "升起"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 #, fuzzy
 msgid "Lower"
 msgstr "低"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "关闭"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "杀死"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "窗口:状态"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "粘着模式切换"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "图标模式切换"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "全屏状态切换"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "全屏最大化"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化模式 \"智能\""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
@@ -276,188 +276,188 @@ msgstr "切换无边框状态"
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "左桌面"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "显示桌面"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "左桌面"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -468,136 +468,136 @@ msgstr "切换到桌面 ..."
 msgid "Screen"
 msgstr "屏幕区域"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "窗口:移动"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "发送到下个桌面"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "桌面号 #..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "到桌面..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "显示主窗口"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "显示“我的最爱”菜单"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "显示所有应用程序菜单"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "显示 客户端 菜单"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "显示菜单..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "启动"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "定义命令"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "应用程序"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "立即退出"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "系统"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "关机"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "挂起到硬盘"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "桌面锁"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
@@ -606,11 +606,11 @@ msgstr "重新排列窗口"
 msgid "Set As Background"
 msgstr "背景"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "桌面  %i, %i"
@@ -649,11 +649,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "桌面  %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "配置已经升级"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -661,7 +661,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -671,7 +671,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -680,7 +680,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -689,7 +689,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -697,18 +697,17 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 #, fuzzy
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Enlightenment 配置写问题"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -717,19 +716,20 @@ msgstr "Enlightenment 配置写问题"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "确定"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 #, fuzzy
 msgid "Advanced"
 msgstr "高级设置"
@@ -746,14 +746,14 @@ msgstr "应用"
 msgid "Extensions"
 msgstr "扩展"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "模块"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
@@ -811,7 +811,7 @@ msgid "Desktop Entry Editor"
 msgstr ""
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "图标"
@@ -848,7 +848,7 @@ msgstr "一般信息"
 msgid "Window Class"
 msgstr "窗口类"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr ""
@@ -897,6 +897,7 @@ msgstr "选择一个图标"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "取消"
 
@@ -905,7 +906,7 @@ msgstr "取消"
 msgid "Select an Executable"
 msgstr "可执行"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -913,16 +914,16 @@ msgstr "可执行"
 msgid "Delete"
 msgstr "删除"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 #, fuzzy
 msgid "Cut"
 msgstr "自定义"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "复制"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 #, fuzzy
 msgid "Paste"
 msgstr "框"
@@ -932,220 +933,220 @@ msgstr "框"
 msgid "Select All"
 msgstr "删除所有"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "运行时错误"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment无法创建一个子进程:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "应用程序运行错误"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "错误信息"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:520
+#: src/bin/e_fm.c:515
 #, c-format
-msgid "%s doesn't exists"
+msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i  文件"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 #, fuzzy
 msgid "View Mode"
 msgstr "编辑模式"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "新目录"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "改名"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 #, fuzzy
 msgid "Properties"
 msgstr "窗口属性"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 #, fuzzy
 msgid "Icons"
 msgstr "图标"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 #, fuzzy
 msgid "List"
 msgstr "窗口列表"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "改名%s 为::"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "改文件名"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您确定删除<br><hilight>%s</hilight>吗?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1201,7 +1202,7 @@ msgid "Owner can write"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1237,49 +1238,49 @@ msgstr "错误信息"
 msgid "Select an Image"
 msgstr "选择一个图标"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1293,27 +1294,27 @@ msgstr ""
 msgid "Appearance"
 msgstr "外观"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1340,7 +1341,7 @@ msgid ""
 "init<br>splash theme that is correctly made or fix the<br>one you use."
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "窗口锁"
 
@@ -1374,21 +1375,21 @@ msgid "Lock program changing:"
 msgstr "锁定程序改变:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "堆叠"
 
@@ -1397,12 +1398,12 @@ msgid "Iconified state"
 msgstr "最小化状态"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "粘住状态"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "卷起状态"
 
@@ -1418,7 +1419,7 @@ msgstr "全屏状态"
 msgid "Lock me from changing:"
 msgstr "锁住我以防更改:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "边框样式"
 
@@ -1438,133 +1439,133 @@ msgstr "退出登录,不管这个开着的窗口"
 msgid "Remember these Locks"
 msgstr "记住这些锁"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "置顶"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "置底"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "记住"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "边框"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "发送到桌面"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 #, fuzzy
 msgid "Pin to Desktop"
 msgstr "发送到桌面"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 #, fuzzy
 msgid "Unpin from Desktop"
 msgstr "发送到桌面"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "状态"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "编辑图标"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 #, fuzzy
 msgid "Add To Favorites Menu"
 msgstr "显示“我的最爱”菜单"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 #, fuzzy
 msgid "Add To Launcher"
 msgstr "添加应用到启动器"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "创建图标"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "窗口属性"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "最小化"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 #, fuzzy
 msgid "Select Border Style"
 msgstr "默认边框样式"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "应用程序下移"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "用户定义目录"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "卷起"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "粘住"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1573,6 +1574,10 @@ msgstr "窗口列表"
 msgid "Pager"
 msgstr "桌面切换器"
 
+#: src/bin/e_int_border_menu.c:1014
+msgid "Taskbar"
+msgstr ""
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr ""
@@ -1586,7 +1591,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "窗口属性"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "标题"
 
@@ -1684,11 +1689,11 @@ msgstr "窗口属性"
 msgid "Modal"
 msgstr "模块"
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 #, fuzzy
 msgid "Skip Pager"
 msgstr "桌面切换器"
@@ -1698,15 +1703,15 @@ msgstr "桌面切换器"
 msgid "Hidden"
 msgstr "禁止"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "记住窗口"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "窗口属性不唯一匹配"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1727,11 +1732,11 @@ msgstr ""
 "<hilight>OK</hilight>按钮,你的操作就会生效。<br>如果你不想,按下<hilight>取"
 "消</hilight>,那就什么都不会发生。"
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "没有匹配的属性被设定"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1742,7 +1747,7 @@ msgstr ""
 "到一个窗口,却<hilight>不指定如何记住它</hilight>。<br><br>你必须指定至少一种"
 "记住这个窗口的方法。"
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1767,125 +1772,125 @@ msgstr ""
 "的,按一下<hilight>应用</hilight>或者<hilight>OK</hilight>按钮,你的操作就会"
 "生效。<br>如果你不想,按下<hilight>取消</hilight>,那就什么都不会发生。"
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "没有东西"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "大小和位置"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "锁定"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "大小,位置和锁"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "任何东西"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "记住使用"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "窗口的名字和类"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "窗口角色"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "窗口类型"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "记住属性"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "虚拟桌面"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 #, fuzzy
 msgid "Current Screen"
 msgstr "屏幕区域"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "跳过窗口列表"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "匹配单个窗口"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "登陆时启动该程序"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "配置"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 #, fuzzy
 msgid "File Manager"
 msgstr "管理器"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "书架"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "模块设置"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 #, fuzzy
 msgid "Available Modules"
 msgstr "可用程序"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 #, fuzzy
 msgid "Load Module"
 msgstr "(没有模块装入)"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "(没有模块装入)"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 #, fuzzy
 msgid "Unload Module"
 msgstr "装入模块错误"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1948,10 +1953,12 @@ msgstr "最常用程序"
 msgid "Applications"
 msgstr "应用程序"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "窗口"
 
@@ -1978,52 +1985,52 @@ msgstr "书架"
 msgid "Show/Hide All Windows"
 msgstr "显示/隐藏所有窗口"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(无应用程序)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "配置虚拟桌面"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "锁定屏幕"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "退出"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(无窗口)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "丢失的窗口"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "无名!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(无架No Shelves)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "添加一个架子"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "删除一个书架"
 
@@ -2032,13 +2039,13 @@ msgid "Shelf Configuration"
 msgstr "书架配置"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
@@ -2047,12 +2054,12 @@ msgid "Medium"
 msgstr "中等"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
@@ -2090,7 +2097,7 @@ msgid "%3.0f pixels"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr ""
 
@@ -2634,7 +2641,7 @@ msgstr "配置"
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2642,11 +2649,11 @@ msgid ""
 msgstr ""
 "导入模块 %s 时发生错误。<br>在模块搜索路径中<br>没有找到名叫 %s 的模块。<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "装入模块错误"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2655,11 +2662,11 @@ msgstr ""
 "导入模块 %s 时发生错误。<br>该模块的全路径是:<br>%s<br>错误报告如下:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "模块没包括所有必需的功能"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2669,12 +2676,12 @@ msgstr ""
 "模块 API 错误<br>启动模块错误:%s<br>要求最小的模块 API 版本号:%i。"
 "<br>Enlightenment给的模块版本号:%i。<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模块"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸载这个模块?<br>"
 
@@ -2959,9 +2966,9 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr ""
 
@@ -2998,39 +3005,39 @@ msgstr "禁止"
 msgid "Read-Write"
 msgstr "读写"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "电池监视器设置"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "基本设置"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f 分钟"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -3041,70 +3048,52 @@ msgstr ""
 msgid "%1.0f minutes"
 msgstr "%1.0f 分钟"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, fuzzy, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f 分钟"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "电池"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr "电池电量低<br>您的电池电量低。<br>您可能需要切换到使用交流电源。"
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "错误的驱动"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "满"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "高"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "低"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "危险"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "充电中"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "电池"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "电池"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "时钟"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment 配置"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr ""
 
@@ -3139,7 +3128,7 @@ msgid "Restart Applications"
 msgstr "最常用程序"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "所有应用程序"
 
@@ -3201,7 +3190,7 @@ msgstr ""
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3308,7 +3297,7 @@ msgid "Error Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "菜单标题"
 
@@ -3317,7 +3306,7 @@ msgid "Menu Title Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr ""
 
@@ -3326,12 +3315,12 @@ msgid "Menu Item Active"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr ""
 
@@ -3344,12 +3333,12 @@ msgid "Winlist Label"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "窗口列表标题"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "构件"
 
@@ -3386,7 +3375,7 @@ msgid "List Item Odd Text"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr ""
 
@@ -3475,6 +3464,7 @@ msgstr "桌面"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr ""
 
@@ -3519,10 +3509,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "个人"
 
@@ -3852,11 +3842,11 @@ msgstr "启用弹出"
 msgid "Default Engine"
 msgstr "默认目录"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 msgid "Enable Composite Support ?"
 msgstr ""
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3980,194 +3970,199 @@ msgstr "Y轴看齐"
 msgid "Run Command"
 msgstr "运行命令"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 #, fuzzy
 msgid "Core"
 msgstr "关闭"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "标题条"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "配置题头"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "关于标题"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "关于文本"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "对话出错"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Exebuf 命令"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "Splash 标题"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "条目"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "帧"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "标识"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "按钮"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "滑动条"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
 msgid "Filemanager"
 msgstr "管理器"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "显示桌面"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "正常样式"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "字体设置"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "字体"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "自动"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr ""
 
@@ -4210,7 +4205,7 @@ msgid "New"
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr ""
 
@@ -4266,22 +4261,64 @@ msgstr "管理器"
 msgid "Input Method Settings"
 msgstr "输入法"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "选取设置"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%1.0f 分钟"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.0f 分钟"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "通用"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "语言配置"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "语音选择器"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "语境选定"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "语境"
 
@@ -4606,11 +4643,6 @@ msgstr ""
 msgid "Cursor Size"
 msgstr ""
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr ""
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "鼠标指针"
@@ -4648,7 +4680,7 @@ msgid "Images"
 msgstr "图片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "主题"
 
@@ -4811,11 +4843,6 @@ msgstr ""
 msgid "Time until X screensaver alternates"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr ""
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 #, fuzzy
 msgid "Blanking"
@@ -4875,25 +4902,25 @@ msgstr ""
 msgid "Startup"
 msgstr "启动时"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 #, fuzzy
 msgid "Theme Categories"
 msgstr "定义主题"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 #, fuzzy
 msgid "Clear"
 msgstr "è¿‘"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 #, fuzzy
 msgid "Clear All"
 msgstr "删除所有"
@@ -4938,38 +4965,43 @@ msgstr ""
 msgid "Transitions"
 msgstr "变换"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "墙纸设置"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "使用主题墙纸"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "所有桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "这个桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "本屏幕"
 
@@ -5019,7 +5051,7 @@ msgstr ""
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr ""
 
@@ -5069,23 +5101,80 @@ msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 #, fuzzy
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment无法创建一个子进程:<br><br>%s %s<br>"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5378,6 +5467,61 @@ msgstr ""
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "记住窗口"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "记住"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "图标名"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "类别"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "图标类"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "标题"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "标题"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "文件:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<æ— >"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "窗口列表设置"
@@ -5741,19 +5885,19 @@ msgstr ""
 msgid "Go to Parent Directory"
 msgstr "回到上级目录"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "打开"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "特定应用程序"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "运行命令"
@@ -6043,7 +6187,7 @@ msgstr "桌面"
 msgid "Popup Desk Down"
 msgstr ""
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "开始菜单"
 
@@ -6051,112 +6195,112 @@ msgstr "开始菜单"
 msgid "Temperature Configuration"
 msgstr "温度配置"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 #, fuzzy
 msgid "Celsius"
 msgstr "摄氏"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "华氏"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "检查间隔"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "å¿«"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "æ…¢"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "很慢"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "低温"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "传感器"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr ""
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "温度"
 
@@ -6178,6 +6322,29 @@ msgstr "基本"
 msgid "Choose Language"
 msgstr ""
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr "电池电量低<br>您的电池电量低。<br>您可能需要切换到使用交流电源。"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "错误的驱动"
+
+#~ msgid "FULL"
+#~ msgstr "满"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgid "Danger"
+#~ msgstr "危险"
+
+#~ msgid "Charging"
+#~ msgstr "充电中"
+
 #~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
 #~ msgstr "Enlightenment无法创建一个命令行:<br><br>%s %s<br>"
 
@@ -6286,9 +6453,6 @@ msgstr ""
 #~ msgid "Window Title"
 #~ msgstr "窗口标题"
 
-#~ msgid "Icon Class"
-#~ msgstr "图标类"
-
 #~ msgid "Misc"
 #~ msgstr "杂项"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index b15c647..16c4aeb 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 73d117d..77e6634 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-25 13:23+1100\n"
+"POT-Creation-Date: 2008-05-19 09:50+1000\n"
 "PO-Revision-Date: 2007-11-06 20:25+0800\n"
 "Last-Translator: Chia-I Wu <olv at openmoko.com>\n"
 "Language-Team: none\n"
@@ -20,8 +20,8 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "關於 Enlightenment"
 
-#: src/bin/e_about.c:74 src/bin/e_actions.c:2300 src/bin/e_actions.c:2304
-#: src/bin/e_actions.c:2308 src/bin/e_actions.c:2312 src/bin/e_int_menus.c:168
+#: src/bin/e_about.c:74 src/bin/e_actions.c:2301 src/bin/e_actions.c:2305
+#: src/bin/e_actions.c:2309 src/bin/e_actions.c:2313 src/bin/e_int_menus.c:168
 #: src/bin/e_main.c:563
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -58,15 +58,15 @@ msgstr "您是否確定強制結束此視窗?"
 
 #: src/bin/e_actions.c:327 src/bin/e_actions.c:1600 src/bin/e_actions.c:1671
 #: src/bin/e_actions.c:1730 src/bin/e_actions.c:1789 src/bin/e_actions.c:1848
-#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7002
-#: src/bin/e_module.c:485 src/modules/conf_display/e_int_config_display.c:215
+#: src/bin/e_actions.c:1907 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:7012
+#: src/bin/e_module.c:497 src/modules/conf_display/e_int_config_display.c:215
 msgid "Yes"
 msgstr "是"
 
 #: src/bin/e_actions.c:329 src/bin/e_actions.c:1602 src/bin/e_actions.c:1673
 #: src/bin/e_actions.c:1732 src/bin/e_actions.c:1791 src/bin/e_actions.c:1850
-#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7003
-#: src/bin/e_module.c:486 src/modules/conf_display/e_int_config_display.c:216
+#: src/bin/e_actions.c:1909 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:7013
+#: src/bin/e_module.c:498 src/modules/conf_display/e_int_config_display.c:216
 msgid "No"
 msgstr "否"
 
@@ -123,334 +123,334 @@ msgid ""
 "suspend to disk?"
 msgstr "您要求進入休眠狀態。<br><br>您是否確定休眠?"
 
-#: src/bin/e_actions.c:1980 src/bin/e_actions.c:1990 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2013 src/bin/e_actions.c:2018 src/bin/e_actions.c:2023
-#: src/bin/e_actions.c:2232 src/bin/e_actions.c:2237 src/bin/e_actions.c:2243
-#: src/bin/e_actions.c:2249 src/bin/e_actions.c:2255
+#: src/bin/e_actions.c:1981 src/bin/e_actions.c:1991 src/bin/e_actions.c:2009
+#: src/bin/e_actions.c:2014 src/bin/e_actions.c:2019 src/bin/e_actions.c:2024
+#: src/bin/e_actions.c:2233 src/bin/e_actions.c:2238 src/bin/e_actions.c:2244
+#: src/bin/e_actions.c:2250 src/bin/e_actions.c:2256
 msgid "Window : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:1980
+#: src/bin/e_actions.c:1981
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:1990
+#: src/bin/e_actions.c:1991
 msgid "Resize"
 msgstr "改變大小"
 
-#: src/bin/e_actions.c:2000 src/bin/e_actions.c:2276 src/bin/e_actions.c:2278
-#: src/bin/e_actions.c:2280 src/bin/e_actions.c:2282 src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2001 src/bin/e_actions.c:2277 src/bin/e_actions.c:2279
+#: src/bin/e_actions.c:2281 src/bin/e_actions.c:2283 src/bin/e_actions.c:2285
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Menu"
 msgstr "選單"
 
-#: src/bin/e_actions.c:2000
+#: src/bin/e_actions.c:2001
 msgid "Window Menu"
 msgstr "視窗選單"
 
-#: src/bin/e_actions.c:2008 src/bin/e_int_border_menu.c:346
+#: src/bin/e_actions.c:2009 src/bin/e_int_border_menu.c:347
 msgid "Raise"
 msgstr "上移"
 
-#: src/bin/e_actions.c:2013 src/bin/e_int_border_menu.c:354
+#: src/bin/e_actions.c:2014 src/bin/e_int_border_menu.c:355
 msgid "Lower"
 msgstr "下移"
 
-#: src/bin/e_actions.c:2018 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:515
-#: src/bin/e_int_border_menu.c:328 src/bin/e_int_border_prop.c:81
-#: src/modules/conf/e_conf.c:168 src/modules/fileman/e_fwin.c:1309
+#: src/bin/e_actions.c:2019 src/bin/e_config_dialog.c:226 src/bin/e_fm.c:510
+#: src/bin/e_int_border_menu.c:329 src/bin/e_int_border_prop.c:81
+#: src/modules/conf/e_conf.c:170 src/modules/fileman/e_fwin.c:1322
 msgid "Close"
 msgstr "關閉"
 
-#: src/bin/e_actions.c:2023 src/bin/e_int_border_menu.c:317
+#: src/bin/e_actions.c:2024 src/bin/e_int_border_menu.c:318
 msgid "Kill"
 msgstr "強制結束"
 
-#: src/bin/e_actions.c:2028 src/bin/e_actions.c:2035 src/bin/e_actions.c:2042
-#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2057 src/bin/e_actions.c:2059 src/bin/e_actions.c:2061
-#: src/bin/e_actions.c:2063 src/bin/e_actions.c:2070 src/bin/e_actions.c:2072
-#: src/bin/e_actions.c:2074 src/bin/e_actions.c:2076 src/bin/e_actions.c:2078
-#: src/bin/e_actions.c:2085 src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2029 src/bin/e_actions.c:2036 src/bin/e_actions.c:2043
+#: src/bin/e_actions.c:2050 src/bin/e_actions.c:2052 src/bin/e_actions.c:2055
+#: src/bin/e_actions.c:2058 src/bin/e_actions.c:2060 src/bin/e_actions.c:2062
+#: src/bin/e_actions.c:2064 src/bin/e_actions.c:2071 src/bin/e_actions.c:2073
+#: src/bin/e_actions.c:2075 src/bin/e_actions.c:2077 src/bin/e_actions.c:2079
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2091
 msgid "Window : State"
 msgstr "視窗: 狀態"
 
-#: src/bin/e_actions.c:2028
+#: src/bin/e_actions.c:2029
 msgid "Sticky Mode Toggle"
 msgstr "切換相黏模式"
 
-#: src/bin/e_actions.c:2035
+#: src/bin/e_actions.c:2036
 msgid "Iconic Mode Toggle"
 msgstr "切換圖示化"
 
-#: src/bin/e_actions.c:2042
+#: src/bin/e_actions.c:2043
 msgid "Fullscreen Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:2049 src/bin/e_int_border_menu.c:107
-#: src/bin/e_int_border_menu.c:237
+#: src/bin/e_actions.c:2050 src/bin/e_int_border_menu.c:108
+#: src/bin/e_int_border_menu.c:238
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2051
+#: src/bin/e_actions.c:2052
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2054
+#: src/bin/e_actions.c:2055
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2057
+#: src/bin/e_actions.c:2058
 msgid "Maximize Fullscreen"
 msgstr "全螢幕最大化"
 
-#: src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2060
 msgid "Maximize Mode \"Smart\""
 msgstr "「智慧型」最大化模式"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2062
 msgid "Maximize Mode \"Expand\""
 msgstr "「展開」最大化模式"
 
-#: src/bin/e_actions.c:2063
+#: src/bin/e_actions.c:2064
 msgid "Maximize Mode \"Fill\""
 msgstr "「填滿」最大化模式"
 
-#: src/bin/e_actions.c:2070
+#: src/bin/e_actions.c:2071
 msgid "Shade Up Mode Toggle"
 msgstr "切換上捲模式"
 
-#: src/bin/e_actions.c:2072
+#: src/bin/e_actions.c:2073
 msgid "Shade Down Mode Toggle"
 msgstr "切換下捲模式"
 
-#: src/bin/e_actions.c:2074
+#: src/bin/e_actions.c:2075
 msgid "Shade Left Mode Toggle"
 msgstr "切換左捲模式"
 
-#: src/bin/e_actions.c:2076
+#: src/bin/e_actions.c:2077
 msgid "Shade Right Mode Toggle"
 msgstr "切換右捲模式"
 
-#: src/bin/e_actions.c:2078
+#: src/bin/e_actions.c:2079
 msgid "Shade Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:2085
+#: src/bin/e_actions.c:2086
 msgid "Toggle Borderless State"
 msgstr "切換無邊框狀態"
 
-#: src/bin/e_actions.c:2090
+#: src/bin/e_actions.c:2091
 msgid "Toggle Pinned State"
 msgstr "切換固定於桌面狀態"
 
-#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2097 src/bin/e_actions.c:2099
-#: src/bin/e_actions.c:2101 src/bin/e_actions.c:2103 src/bin/e_actions.c:2109
-#: src/bin/e_actions.c:2114 src/bin/e_actions.c:2120 src/bin/e_actions.c:2126
-#: src/bin/e_actions.c:2128 src/bin/e_actions.c:2130 src/bin/e_actions.c:2132
-#: src/bin/e_actions.c:2134 src/bin/e_actions.c:2136 src/bin/e_actions.c:2138
-#: src/bin/e_actions.c:2140 src/bin/e_actions.c:2142 src/bin/e_actions.c:2144
-#: src/bin/e_actions.c:2146 src/bin/e_actions.c:2148 src/bin/e_actions.c:2150
-#: src/bin/e_actions.c:2156 src/bin/e_actions.c:2158 src/bin/e_actions.c:2160
-#: src/bin/e_actions.c:2162 src/bin/e_actions.c:2164 src/bin/e_actions.c:2170
-#: src/bin/e_actions.c:2176 src/bin/e_actions.c:2182 src/bin/e_actions.c:2184
-#: src/bin/e_actions.c:2186 src/bin/e_actions.c:2188 src/bin/e_actions.c:2190
-#: src/bin/e_actions.c:2192 src/bin/e_actions.c:2194 src/bin/e_actions.c:2196
-#: src/bin/e_actions.c:2198 src/bin/e_actions.c:2200 src/bin/e_actions.c:2202
-#: src/bin/e_actions.c:2204 src/bin/e_actions.c:2206 src/bin/e_actions.c:2336
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:135
+#: src/bin/e_actions.c:2096 src/bin/e_actions.c:2098 src/bin/e_actions.c:2100
+#: src/bin/e_actions.c:2102 src/bin/e_actions.c:2104 src/bin/e_actions.c:2110
+#: src/bin/e_actions.c:2115 src/bin/e_actions.c:2121 src/bin/e_actions.c:2127
+#: src/bin/e_actions.c:2129 src/bin/e_actions.c:2131 src/bin/e_actions.c:2133
+#: src/bin/e_actions.c:2135 src/bin/e_actions.c:2137 src/bin/e_actions.c:2139
+#: src/bin/e_actions.c:2141 src/bin/e_actions.c:2143 src/bin/e_actions.c:2145
+#: src/bin/e_actions.c:2147 src/bin/e_actions.c:2149 src/bin/e_actions.c:2151
+#: src/bin/e_actions.c:2157 src/bin/e_actions.c:2159 src/bin/e_actions.c:2161
+#: src/bin/e_actions.c:2163 src/bin/e_actions.c:2165 src/bin/e_actions.c:2171
+#: src/bin/e_actions.c:2177 src/bin/e_actions.c:2183 src/bin/e_actions.c:2185
+#: src/bin/e_actions.c:2187 src/bin/e_actions.c:2189 src/bin/e_actions.c:2191
+#: src/bin/e_actions.c:2193 src/bin/e_actions.c:2195 src/bin/e_actions.c:2197
+#: src/bin/e_actions.c:2199 src/bin/e_actions.c:2201 src/bin/e_actions.c:2203
+#: src/bin/e_actions.c:2205 src/bin/e_actions.c:2207 src/bin/e_actions.c:2337
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:135
 #: src/bin/e_int_shelf_config.c:661
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
 #: src/modules/ibox/e_mod_config.c:141
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2095
+#: src/bin/e_actions.c:2096
 msgid "Flip Desktop Left"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2097
+#: src/bin/e_actions.c:2098
 msgid "Flip Desktop Right"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2099
+#: src/bin/e_actions.c:2100
 msgid "Flip Desktop Up"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2101
+#: src/bin/e_actions.c:2102
 msgid "Flip Desktop Down"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2103
+#: src/bin/e_actions.c:2104
 msgid "Flip Desktop By..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2110
 msgid "Show The Desktop"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2114
+#: src/bin/e_actions.c:2115
 msgid "Flip Desktop To..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2120
+#: src/bin/e_actions.c:2121
 msgid "Flip Desktop Linearly..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2126
+#: src/bin/e_actions.c:2127
 msgid "Switch To Desktop 0"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2128
+#: src/bin/e_actions.c:2129
 msgid "Switch To Desktop 1"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2130
+#: src/bin/e_actions.c:2131
 msgid "Switch To Desktop 2"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2132
+#: src/bin/e_actions.c:2133
 msgid "Switch To Desktop 3"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2134
+#: src/bin/e_actions.c:2135
 msgid "Switch To Desktop 4"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2136
+#: src/bin/e_actions.c:2137
 msgid "Switch To Desktop 5"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2138
+#: src/bin/e_actions.c:2139
 msgid "Switch To Desktop 6"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2140
+#: src/bin/e_actions.c:2141
 msgid "Switch To Desktop 7"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2142
+#: src/bin/e_actions.c:2143
 msgid "Switch To Desktop 8"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2144
+#: src/bin/e_actions.c:2145
 msgid "Switch To Desktop 9"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2146
+#: src/bin/e_actions.c:2147
 msgid "Switch To Desktop 10"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2148
+#: src/bin/e_actions.c:2149
 msgid "Switch To Desktop 11"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2150
+#: src/bin/e_actions.c:2151
 msgid "Switch To Desktop..."
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2156
+#: src/bin/e_actions.c:2157
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2158
+#: src/bin/e_actions.c:2159
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2160
+#: src/bin/e_actions.c:2161
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2162
+#: src/bin/e_actions.c:2163
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2164
+#: src/bin/e_actions.c:2165
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2170
+#: src/bin/e_actions.c:2171
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2176
+#: src/bin/e_actions.c:2177
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2182
+#: src/bin/e_actions.c:2183
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2184
+#: src/bin/e_actions.c:2185
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2186
+#: src/bin/e_actions.c:2187
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2188
+#: src/bin/e_actions.c:2189
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2190
+#: src/bin/e_actions.c:2191
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2192
+#: src/bin/e_actions.c:2193
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2194
+#: src/bin/e_actions.c:2195
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2196
+#: src/bin/e_actions.c:2197
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2198
+#: src/bin/e_actions.c:2199
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2200
+#: src/bin/e_actions.c:2201
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2202
+#: src/bin/e_actions.c:2203
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2204
+#: src/bin/e_actions.c:2205
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2206
+#: src/bin/e_actions.c:2207
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2213 src/bin/e_actions.c:2215 src/bin/e_actions.c:2217
-#: src/bin/e_actions.c:2222 src/bin/e_actions.c:2224 src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2214 src/bin/e_actions.c:2216 src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2223 src/bin/e_actions.c:2225 src/bin/e_actions.c:2227
 #: src/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -460,136 +460,136 @@ msgstr "切換桌面到..."
 msgid "Screen"
 msgstr "螢幕"
 
-#: src/bin/e_actions.c:2213
+#: src/bin/e_actions.c:2214
 msgid "Send Mouse To Screen 0"
 msgstr "將滑鼠送到螢幕 0"
 
-#: src/bin/e_actions.c:2215
+#: src/bin/e_actions.c:2216
 msgid "Send Mouse To Screen 1"
 msgstr "將滑鼠送到螢幕 1"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2218
 msgid "Send Mouse To Screen..."
 msgstr "將滑鼠送到其它螢幕..."
 
-#: src/bin/e_actions.c:2222
+#: src/bin/e_actions.c:2223
 msgid "Send Mouse Forward 1 Screen"
 msgstr "將滑鼠送到下一螢幕"
 
-#: src/bin/e_actions.c:2224
+#: src/bin/e_actions.c:2225
 msgid "Send Mouse Back 1 Screen"
 msgstr "將滑鼠送到上一螢幕"
 
-#: src/bin/e_actions.c:2226
+#: src/bin/e_actions.c:2227
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "將滑鼠送到目前螢幕之..."
 
-#: src/bin/e_actions.c:2260 src/bin/e_actions.c:2262 src/bin/e_actions.c:2264
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2261 src/bin/e_actions.c:2263 src/bin/e_actions.c:2265
+#: src/bin/e_actions.c:2271
 msgid "Window : Moving"
 msgstr "視窗: 移動"
 
-#: src/bin/e_actions.c:2260
+#: src/bin/e_actions.c:2261
 msgid "To Next Desktop"
 msgstr "送到下一桌面"
 
-#: src/bin/e_actions.c:2262
+#: src/bin/e_actions.c:2263
 msgid "To Previous Desktop"
 msgstr "送到上一桌面"
 
-#: src/bin/e_actions.c:2264
+#: src/bin/e_actions.c:2265
 msgid "By Desktop #..."
 msgstr "目前桌面之..."
 
-#: src/bin/e_actions.c:2270
+#: src/bin/e_actions.c:2271
 msgid "To Desktop..."
 msgstr "送到桌面..."
 
-#: src/bin/e_actions.c:2276
+#: src/bin/e_actions.c:2277
 msgid "Show Main Menu"
 msgstr "顯示主選單"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2279
 msgid "Show Favorites Menu"
 msgstr "顯示「我的最愛」選單"
 
-#: src/bin/e_actions.c:2280
+#: src/bin/e_actions.c:2281
 msgid "Show All Applications Menu"
 msgstr "顯示「應用程式」選單"
 
-#: src/bin/e_actions.c:2282
+#: src/bin/e_actions.c:2283
 msgid "Show Clients Menu"
 msgstr "顯示「視窗列表」選單"
 
-#: src/bin/e_actions.c:2284
+#: src/bin/e_actions.c:2285
 msgid "Show Menu..."
 msgstr "顯示選單..."
 
-#: src/bin/e_actions.c:2291 src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2292 src/bin/e_actions.c:2297
 #: src/modules/conf/e_mod_main.c:46 src/modules/conf/e_mod_main.c:67
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:68
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "Launch"
 msgstr "å•Ÿå‹•"
 
-#: src/bin/e_actions.c:2291
+#: src/bin/e_actions.c:2292
 msgid "Defined Command"
 msgstr "指定命令"
 
-#: src/bin/e_actions.c:2296
+#: src/bin/e_actions.c:2297
 msgid "Application"
 msgstr "應用程式"
 
-#: src/bin/e_actions.c:2300 src/bin/e_int_menus.c:193
+#: src/bin/e_actions.c:2301 src/bin/e_int_menus.c:193
 msgid "Restart"
 msgstr "重新啟動"
 
-#: src/bin/e_actions.c:2304 src/bin/e_int_menus.c:198
+#: src/bin/e_actions.c:2305 src/bin/e_int_menus.c:198
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2308
+#: src/bin/e_actions.c:2309
 msgid "Log Out"
 msgstr "登入"
 
-#: src/bin/e_actions.c:2312
+#: src/bin/e_actions.c:2313
 msgid "Exit Immediately"
 msgstr "立即退出"
 
-#: src/bin/e_actions.c:2316 src/bin/e_actions.c:2320 src/bin/e_actions.c:2324
-#: src/bin/e_actions.c:2328 src/bin/e_int_config_modules.c:44
+#: src/bin/e_actions.c:2317 src/bin/e_actions.c:2321 src/bin/e_actions.c:2325
+#: src/bin/e_actions.c:2329 src/bin/e_int_config_modules.c:45
 #: src/bin/e_int_menus.c:230
 #: src/modules/conf_desklock/e_int_config_desklock.c:195
 #: src/modules/conf_imc/e_int_config_imc.c:823
 #: src/modules/conf_startup/e_int_config_startup.c:273
-#: src/modules/conf_theme/e_int_config_theme.c:379
-#: src/modules/conf_theme/e_int_config_theme.c:849
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:492
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:638
+#: src/modules/conf_theme/e_int_config_theme.c:335
+#: src/modules/conf_theme/e_int_config_theme.c:768
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:501
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:627
 msgid "System"
 msgstr "系統"
 
-#: src/bin/e_actions.c:2316 src/bin/e_int_menus.c:879
+#: src/bin/e_actions.c:2317 src/bin/e_int_menus.c:890
 msgid "Shut Down"
 msgstr "關機"
 
-#: src/bin/e_actions.c:2320 src/bin/e_int_menus.c:872
+#: src/bin/e_actions.c:2321 src/bin/e_int_menus.c:883
 msgid "Reboot"
 msgstr "重新開機"
 
-#: src/bin/e_actions.c:2324 src/bin/e_int_menus.c:858
+#: src/bin/e_actions.c:2325 src/bin/e_int_menus.c:869
 msgid "Suspend"
 msgstr "å¾…æ©Ÿ"
 
-#: src/bin/e_actions.c:2328
+#: src/bin/e_actions.c:2329
 msgid "Suspend to Disk"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2336
+#: src/bin/e_actions.c:2337
 msgid "Desktop Lock"
 msgstr "鎖定桌面"
 
-#: src/bin/e_actions.c:2341 src/bin/e_int_menus.c:1248
+#: src/bin/e_actions.c:2342 src/bin/e_int_menus.c:1254
 msgid "Cleanup Windows"
 msgstr "排列視窗"
 
@@ -597,11 +597,11 @@ msgstr "排列視窗"
 msgid "Set As Background"
 msgstr "設定為桌布"
 
-#: src/bin/e_border.c:4429
+#: src/bin/e_border.c:4476
 msgid "Desktop files scan done"
 msgstr "完成 desktop 檔案掃描"
 
-#: src/bin/e_border.c:4441
+#: src/bin/e_border.c:4488
 msgid "Desktop file scan"
 msgstr "掃描 desktop 檔案"
 
@@ -637,11 +637,11 @@ msgstr ""
 msgid "Desktop %i, %i"
 msgstr "桌面 %i, %i"
 
-#: src/bin/e_config.c:2209
+#: src/bin/e_config.c:2227
 msgid "Configuration Upgraded"
 msgstr "組態已經更新"
 
-#: src/bin/e_config.c:2234
+#: src/bin/e_config.c:2252
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -651,7 +651,7 @@ msgstr ""
 "當儲存 Enlightment 設定檔時有錯誤發生。<br>錯誤原因無法確定。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:2245
+#: src/bin/e_config.c:2263
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -664,7 +664,7 @@ msgstr ""
 "設定檔應該非常小。<br>請檢查您家目錄的設定。<br><br>發生錯誤的檔案為:<br>%"
 "s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:2258
+#: src/bin/e_config.c:2276
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -675,7 +675,7 @@ msgstr ""
 "當寫入 Enlightment 設定檔時有錯誤發生。<br>您的磁碟有問題而且可能需要替換。"
 "<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:2269
+#: src/bin/e_config.c:2287
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -687,7 +687,7 @@ msgstr ""
 "了磁碟配額。<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設"
 "定。<br>"
 
-#: src/bin/e_config.c:2281
+#: src/bin/e_config.c:2299
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -697,17 +697,16 @@ msgstr ""
 "Enlightment 要寫入的設定檔未預期的被關閉了。<br>這很不尋常。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:2306
+#: src/bin/e_config.c:2324
 msgid "Enlightenment Configuration Write Problems"
 msgstr "Enlightenment 組態寫入發生問題"
 
-#: src/bin/e_config.c:2310 src/bin/e_config_dialog.c:218
+#: src/bin/e_config.c:2328 src/bin/e_config_dialog.c:218
 #: src/bin/e_eap_editor.c:596 src/bin/e_eap_editor.c:660
-#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:324 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:254 src/bin/e_int_border_remember.c:330
-#: src/bin/e_int_border_remember.c:372 src/bin/e_module.c:402
+#: src/bin/e_entry_dialog.c:58 src/bin/e_exec.c:325 src/bin/e_fm_prop.c:513
+#: src/bin/e_int_border_remember.c:259 src/bin/e_int_border_remember.c:339
+#: src/bin/e_int_border_remember.c:381 src/bin/e_module.c:414
 #: src/bin/e_sys.c:397 src/bin/e_sys.c:442 src/bin/e_utils.c:577
-#: src/modules/battery/e_mod_main.c:312
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
@@ -716,19 +715,20 @@ msgstr "Enlightenment 組態寫入發生問題"
 #: src/modules/conf_theme/e_int_config_theme_import.c:112
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:204
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:171
 #: src/modules/cpufreq/e_mod_main.c:340 src/modules/cpufreq/e_mod_main.c:367
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid "OK"
 msgstr "確定"
 
-#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:1455
+#: src/bin/e_config_dialog.c:189 src/modules/battery/e_mod_main.c:415
 #: src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20
-#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Advanced"
 msgstr "進階設定"
 
@@ -744,14 +744,14 @@ msgstr "套用"
 msgid "Extensions"
 msgstr "擴充套件"
 
-#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:791
+#: src/bin/e_configure.c:9 src/bin/e_int_menus.c:805
 #: src/modules/conf_colors/e_int_config_color_classes.c:83
-#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Modules"
 msgstr "模組"
 
-#: src/bin/e_container.c:119
+#: src/bin/e_container.c:118
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
@@ -815,7 +815,7 @@ msgid "Desktop Entry Editor"
 msgstr "Desktop Entry 編輯器"
 
 #: src/bin/e_eap_editor.c:444 src/bin/e_fm_prop.c:400
-#: src/modules/conf_fonts/e_int_config_fonts.c:94
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "圖示"
@@ -851,7 +851,7 @@ msgstr "通用名稱"
 msgid "Window Class"
 msgstr "視窗類別"
 
-#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:149
+#: src/bin/e_eap_editor.c:507 src/modules/conf/e_conf.c:151
 #: src/modules/conf_mime/e_int_config_mime.c:189
 msgid "Categories"
 msgstr "類別"
@@ -898,6 +898,7 @@ msgstr "選擇圖示"
 #: src/modules/conf_theme/e_int_config_theme_import.c:116
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:208
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:172
 msgid "Cancel"
 msgstr "取消"
 
@@ -905,7 +906,7 @@ msgstr "取消"
 msgid "Select an Executable"
 msgstr "選擇一個執行檔"
 
-#: src/bin/e_entry.c:470 src/bin/e_fm.c:6517
+#: src/bin/e_entry.c:470 src/bin/e_fm.c:6527
 #: src/modules/conf_applications/e_int_config_apps.c:271
 #: src/modules/conf_profiles/e_int_config_profiles.c:93
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
@@ -913,15 +914,15 @@ msgstr "選擇一個執行檔"
 msgid "Delete"
 msgstr "刪除"
 
-#: src/bin/e_entry.c:483 src/bin/e_fm.c:6427
+#: src/bin/e_entry.c:483 src/bin/e_fm.c:6437
 msgid "Cut"
 msgstr "剪下"
 
-#: src/bin/e_entry.c:494 src/bin/e_fm.c:6444
+#: src/bin/e_entry.c:494 src/bin/e_fm.c:6454
 msgid "Copy"
 msgstr "複製"
 
-#: src/bin/e_entry.c:505 src/bin/e_fm.c:6268 src/bin/e_fm.c:6458
+#: src/bin/e_entry.c:505 src/bin/e_fm.c:6278 src/bin/e_fm.c:6468
 msgid "Paste"
 msgstr "貼上"
 
@@ -929,216 +930,217 @@ msgstr "貼上"
 msgid "Select All"
 msgstr "全選"
 
-#: src/bin/e_exec.c:227 src/bin/e_utils.c:237
+#: src/bin/e_exec.c:218 src/bin/e_utils.c:237
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:516
 msgid "Run Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_exec.c:228 src/bin/e_utils.c:238
+#: src/bin/e_exec.c:219 src/bin/e_utils.c:238
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:517
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment 無法建立一個子程序:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:315
+#: src/bin/e_exec.c:316
 msgid "Application run error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:317
+#: src/bin/e_exec.c:318
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
 msgstr "Enlightment 無法執行應用程式:<br><br>%s<br><br>此程式無法啟動。"
 
-#: src/bin/e_exec.c:407
+#: src/bin/e_exec.c:412
 msgid "Application Execution Error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:419
+#: src/bin/e_exec.c:424
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 無預警地停止執行。"
 
-#: src/bin/e_exec.c:425
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "錯誤代碼 %i 被 %s 傳回。"
 
-#: src/bin/e_exec.c:432
+#: src/bin/e_exec.c:437
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被 Interrupt Signal 中斷。"
 
-#: src/bin/e_exec.c:434
+#: src/bin/e_exec.c:439
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被 Quit Signal 中斷。"
 
-#: src/bin/e_exec.c:438
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被 Abort Signal 中斷。"
 
-#: src/bin/e_exec.c:441
+#: src/bin/e_exec.c:446
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被 FPE Signal 中斷。"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被 Kill Signal 中斷。"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被 Segmentation Fault 中斷。"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被 Broken Pipe 中斷。"
 
-#: src/bin/e_exec.c:453
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被 Terminal Signal 中斷。"
 
-#: src/bin/e_exec.c:456
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被 Bus Error 中斷。"
 
-#: src/bin/e_exec.c:459
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被 Signal %i 中斷。"
 
-#: src/bin/e_exec.c:515
+#: src/bin/e_exec.c:520
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** 剩下的輸出被刪節了。儲存輸出以供檢視。***\n"
 
-#: src/bin/e_exec.c:579 src/bin/e_exec.c:653 src/bin/e_exec.c:659
+#: src/bin/e_exec.c:584 src/bin/e_exec.c:658 src/bin/e_exec.c:664
 msgid "Error Logs"
 msgstr "錯誤紀錄檔"
 
-#: src/bin/e_exec.c:584 src/bin/e_exec.c:660
+#: src/bin/e_exec.c:589 src/bin/e_exec.c:665
 msgid "There was no error message."
 msgstr "沒有錯誤訊息。"
 
-#: src/bin/e_exec.c:588 src/bin/e_exec.c:667
+#: src/bin/e_exec.c:593 src/bin/e_exec.c:672
 msgid "Save This Message"
 msgstr "儲存訊息"
 
-#: src/bin/e_exec.c:592 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:675
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "錯誤紀錄檔已被儲存到 %s/%s.log"
 
-#: src/bin/e_exec.c:618
+#: src/bin/e_exec.c:623
 msgid "Error Information"
 msgstr "錯誤資訊"
 
-#: src/bin/e_exec.c:626
+#: src/bin/e_exec.c:631
 msgid "Error Signal Information"
 msgstr "錯誤 Signal 資訊"
 
-#: src/bin/e_exec.c:637 src/bin/e_exec.c:643
+#: src/bin/e_exec.c:642 src/bin/e_exec.c:648
 msgid "Output Data"
 msgstr "輸出資料"
 
-#: src/bin/e_exec.c:644
+#: src/bin/e_exec.c:649
 msgid "There was no output."
 msgstr "沒有輸入。"
 
-#: src/bin/e_fm.c:517
-msgid "Unexisting path"
+#: src/bin/e_fm.c:512
+#, fuzzy
+msgid "Nonexistent path"
 msgstr "不存在的路徑"
 
-#: src/bin/e_fm.c:520
-#, c-format
-msgid "%s doesn't exists"
+#: src/bin/e_fm.c:515
+#, fuzzy, c-format
+msgid "%s doesn't exist."
 msgstr "不存在 %s"
 
-#: src/bin/e_fm.c:2701
+#: src/bin/e_fm.c:2697
 #, c-format
 msgid "%i Files"
 msgstr "%i 筆檔案"
 
-#: src/bin/e_fm.c:6187 src/bin/e_fm.c:6348
+#: src/bin/e_fm.c:6197 src/bin/e_fm.c:6358
 #: src/modules/fileman/e_mod_config.c:154
 msgid "View Mode"
 msgstr "顯式模式"
 
-#: src/bin/e_fm.c:6194 src/bin/e_fm.c:6355
+#: src/bin/e_fm.c:6204 src/bin/e_fm.c:6365
 msgid "Refresh View"
 msgstr "重新整理"
 
-#: src/bin/e_fm.c:6205 src/bin/e_fm.c:6366
+#: src/bin/e_fm.c:6215 src/bin/e_fm.c:6376
 msgid "Show Hidden Files"
 msgstr "顯示隱藏的檔案"
 
-#: src/bin/e_fm.c:6220 src/bin/e_fm.c:6381
+#: src/bin/e_fm.c:6230 src/bin/e_fm.c:6391
 msgid "Remember Ordering"
 msgstr "記住順序"
 
-#: src/bin/e_fm.c:6232 src/bin/e_fm.c:6393
+#: src/bin/e_fm.c:6242 src/bin/e_fm.c:6403
 msgid "Sort Now"
 msgstr "排列檔案"
 
-#: src/bin/e_fm.c:6250 src/bin/e_fm.c:6411
+#: src/bin/e_fm.c:6260 src/bin/e_fm.c:6421
 #: src/modules/conf_paths/e_int_config_paths.c:211
 msgid "New Directory"
 msgstr "新目錄"
 
-#: src/bin/e_fm.c:6528
+#: src/bin/e_fm.c:6538
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/bin/e_fm.c:6538
+#: src/bin/e_fm.c:6548
 msgid "Properties"
 msgstr "屬性"
 
-#: src/bin/e_fm.c:6699 src/modules/conf_paths/e_int_config_paths.c:83
+#: src/bin/e_fm.c:6709 src/modules/conf_paths/e_int_config_paths.c:83
 #: src/modules/fileman/e_mod_config.c:156
 msgid "Icons"
 msgstr "圖示"
 
-#: src/bin/e_fm.c:6707 src/modules/fileman/e_mod_config.c:169
+#: src/bin/e_fm.c:6717 src/modules/fileman/e_mod_config.c:169
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:6845
+#: src/bin/e_fm.c:6855
 msgid "Create a new Directory"
 msgstr "建立新目錄"
 
-#: src/bin/e_fm.c:6846
+#: src/bin/e_fm.c:6856
 msgid "New Directory Name:"
 msgstr "新目錄名稱"
 
-#: src/bin/e_fm.c:6905
+#: src/bin/e_fm.c:6915
 #, c-format
 msgid "Rename %s to:"
 msgstr "重新命名 %s 成:"
 
-#: src/bin/e_fm.c:6907
+#: src/bin/e_fm.c:6917
 msgid "Rename File"
 msgstr "重新命名檔案"
 
-#: src/bin/e_fm.c:7005
+#: src/bin/e_fm.c:7015
 msgid "Confirm Delete"
 msgstr "確定刪除"
 
-#: src/bin/e_fm.c:7009
+#: src/bin/e_fm.c:7019
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:7015
+#: src/bin/e_fm.c:7025
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1191,7 +1193,7 @@ msgid "Owner can write"
 msgstr "擁有者可以寫入"
 
 #: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:302
-#: src/modules/conf_theme/e_int_config_theme.c:1092
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
@@ -1224,49 +1226,49 @@ msgstr "Link 資訊"
 msgid "Select an Image"
 msgstr "選擇一張圖片"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:212
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:214
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:216
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:218
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:220
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:227
+#: src/bin/e_fm_hal.c:251
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "末知"
 
-#: src/bin/e_fm_hal.c:267
+#: src/bin/e_fm_hal.c:291
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1174
+#: src/bin/e_gadcon.c:1194
 msgid "Plain"
 msgstr "一般"
 
-#: src/bin/e_gadcon.c:1183
+#: src/bin/e_gadcon.c:1203
 msgid "Inset"
 msgstr "嵌入"
 
-#: src/bin/e_gadcon.c:1192 src/bin/e_int_config_modules.c:40
+#: src/bin/e_gadcon.c:1212 src/bin/e_int_config_modules.c:41
 #: src/modules/conf_borders/e_mod_main.c:34
 #: src/modules/conf_colors/e_mod_main.c:34
 #: src/modules/conf_fonts/e_mod_main.c:34
@@ -1280,27 +1282,27 @@ msgstr "嵌入"
 msgid "Appearance"
 msgstr "外觀"
 
-#: src/bin/e_gadcon.c:1198
+#: src/bin/e_gadcon.c:1218
 msgid "Automatically scroll contents"
 msgstr "自動捲動內容"
 
-#: src/bin/e_gadcon.c:1205
+#: src/bin/e_gadcon.c:1225
 msgid "Able to be resized"
 msgstr "可改變大小"
 
-#: src/bin/e_gadcon.c:1217
+#: src/bin/e_gadcon.c:1237
 msgid "Begin move/resize this gadget"
 msgstr "開始移動或改變這個小工具大小"
 
-#: src/bin/e_gadcon.c:1223
+#: src/bin/e_gadcon.c:1243
 msgid "Remove this gadget"
 msgstr "移除這個小工具"
 
-#: src/bin/e_gadcon.c:1609
+#: src/bin/e_gadcon.c:1646
 msgid "Stop move/resize this gadget"
 msgstr "停止移動或改變這個小工具大小"
 
-#: src/bin/e_hints.c:126
+#: src/bin/e_hints.c:131
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
@@ -1328,7 +1330,7 @@ msgstr ""
 "您正用在啟動畫面的佈景主題有錯誤。<br>它不回應啟動已完成的信號。<br>你應該用"
 "正確製作的啟動佈景,<br>或是把你用的修好。"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:159
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:160
 msgid "Window Locks"
 msgstr "視窗鎖定"
 
@@ -1362,21 +1364,21 @@ msgid "Lock program changing:"
 msgstr "鎖定其它程式改變:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:496
+#: src/bin/e_int_border_remember.c:507
 msgid "Position"
 msgstr "位置"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:498 src/bin/e_int_shelf_config.c:515
+#: src/bin/e_int_border_remember.c:509 src/bin/e_int_shelf_config.c:515
 #: src/bin/e_int_shelf_config.c:596
-#: src/modules/conf_fonts/e_int_config_fonts.c:456
-#: src/modules/conf_fonts/e_int_config_fonts.c:650
+#: src/modules/conf_fonts/e_int_config_fonts.c:462
+#: src/modules/conf_fonts/e_int_config_fonts.c:657
 msgid "Size"
 msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:225 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:500 src/bin/e_int_shelf_config.c:552
+#: src/bin/e_int_border_menu.c:226 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:511 src/bin/e_int_shelf_config.c:552
 msgid "Stacking"
 msgstr "堆疊"
 
@@ -1385,12 +1387,12 @@ msgid "Iconified state"
 msgstr "圖示化狀態"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:508
+#: src/bin/e_int_border_remember.c:519
 msgid "Stickiness"
 msgstr "相黏性"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:512
+#: src/bin/e_int_border_remember.c:523
 msgid "Shaded state"
 msgstr "捲起狀態"
 
@@ -1406,7 +1408,7 @@ msgstr "全螢幕狀態"
 msgid "Lock me from changing:"
 msgstr "鎖住我改變:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:504
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:515
 msgid "Border style"
 msgstr "邊框樣式"
 
@@ -1426,126 +1428,126 @@ msgstr "登出系統直到這個視窗被關閉"
 msgid "Remember these Locks"
 msgstr "記住這些鎖定值"
 
-#: src/bin/e_int_border_menu.c:64
+#: src/bin/e_int_border_menu.c:65
 msgid "Always On Top"
 msgstr "最上層顯示"
 
-#: src/bin/e_int_border_menu.c:75
-#: src/modules/conf_fonts/e_int_config_fonts.c:98
-#: src/modules/conf_fonts/e_int_config_fonts.c:261
-#: src/modules/temperature/e_mod_config.c:225
+#: src/bin/e_int_border_menu.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:265
+#: src/modules/temperature/e_mod_config.c:261
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:86
+#: src/bin/e_int_border_menu.c:87
 msgid "Always Below"
 msgstr "最下層顯示"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:119
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:130
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:140
+#: src/bin/e_int_border_menu.c:141
 msgid "Unmaximize"
 msgstr "解除最大化"
 
-#: src/bin/e_int_border_menu.c:166
+#: src/bin/e_int_border_menu.c:167
 msgid "Remember"
 msgstr "記住"
 
-#: src/bin/e_int_border_menu.c:175 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:176 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "邊框"
 
-#: src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_border_menu.c:190
 msgid "Send to Desktop"
 msgstr "送到桌面"
 
-#: src/bin/e_int_border_menu.c:201
+#: src/bin/e_int_border_menu.c:202
 msgid "Pin to Desktop"
 msgstr "固定於桌面"
 
-#: src/bin/e_int_border_menu.c:213
+#: src/bin/e_int_border_menu.c:214
 msgid "Unpin from Desktop"
 msgstr "解除固定於桌面"
 
-#: src/bin/e_int_border_menu.c:246 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:247 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:427
 msgid "State"
 msgstr "狀態"
 
-#: src/bin/e_int_border_menu.c:254
+#: src/bin/e_int_border_menu.c:255
 msgid "Skip"
 msgstr "略過"
 
-#: src/bin/e_int_border_menu.c:270
+#: src/bin/e_int_border_menu.c:271
 msgid "Edit Icon"
 msgstr "編輯圖示"
 
-#: src/bin/e_int_border_menu.c:275
+#: src/bin/e_int_border_menu.c:276
 msgid "Add To Favorites Menu"
 msgstr "加入到「我的最愛」選單"
 
-#: src/bin/e_int_border_menu.c:282
+#: src/bin/e_int_border_menu.c:283
 msgid "Add Keyboard Shortcut"
 msgstr "新增鍵盤快速鍵"
 
-#: src/bin/e_int_border_menu.c:287
+#: src/bin/e_int_border_menu.c:288
 msgid "Add To Launcher"
 msgstr "加入到 IBar"
 
-#: src/bin/e_int_border_menu.c:294
+#: src/bin/e_int_border_menu.c:295
 msgid "Create Icon"
 msgstr "建立圖示"
 
-#: src/bin/e_int_border_menu.c:304 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:305 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "視窗屬性"
 
-#: src/bin/e_int_border_menu.c:365
+#: src/bin/e_int_border_menu.c:366
 msgid "Iconify"
 msgstr "圖示化"
 
-#: src/bin/e_int_border_menu.c:826
+#: src/bin/e_int_border_menu.c:850
 msgid "Select Border Style"
 msgstr "選擇邊框樣式"
 
-#: src/bin/e_int_border_menu.c:838
+#: src/bin/e_int_border_menu.c:862
 msgid "Use E17 Default Icon Preference"
 msgstr "使用 E17 預設圖示偏好"
 
-#: src/bin/e_int_border_menu.c:847
+#: src/bin/e_int_border_menu.c:871
 msgid "Use Application Provided Icon "
 msgstr "使用應用程式圖示"
 
-#: src/bin/e_int_border_menu.c:855
+#: src/bin/e_int_border_menu.c:879
 msgid "Use User Defined Icon"
 msgstr "使用使用者自訂圖示"
 
-#: src/bin/e_int_border_menu.c:919 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:943 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "捲起"
 
-#: src/bin/e_int_border_menu.c:932 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:956 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "相黏"
 
-#: src/bin/e_int_border_menu.c:945 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:969 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:154
 #: src/modules/conf_window_manipulation/e_int_config_window_manipulation.c:215
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: src/bin/e_int_border_menu.c:970 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:994 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "視窗列表"
 
-#: src/bin/e_int_border_menu.c:980 src/modules/pager/e_mod_main.c:263
+#: src/bin/e_int_border_menu.c:1004 src/modules/pager/e_mod_main.c:263
 #: src/modules/pager/e_mod_main.c:2799 src/modules/pager/e_mod_main.c:2806
 #: src/modules/pager/e_mod_main.c:2812 src/modules/pager/e_mod_main.c:2813
 #: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
@@ -1554,6 +1556,11 @@ msgstr "視窗列表"
 msgid "Pager"
 msgstr "桌面切換器"
 
+#: src/bin/e_int_border_menu.c:1014
+#, fuzzy
+msgid "Taskbar"
+msgstr "略過工作列"
+
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
 msgstr "NetWM"
@@ -1566,7 +1573,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM 屬性"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:465
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:476
 msgid "Title"
 msgstr "標題"
 
@@ -1662,11 +1669,11 @@ msgstr "NetWM 屬性"
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:531
 msgid "Skip Taskbar"
 msgstr "略過工作列"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:529
 msgid "Skip Pager"
 msgstr "略過桌面切換器"
 
@@ -1674,15 +1681,15 @@ msgstr "略過桌面切換器"
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/bin/e_int_border_remember.c:72
+#: src/bin/e_int_border_remember.c:74
 msgid "Window Remember"
 msgstr "記住視窗"
 
-#: src/bin/e_int_border_remember.c:237
+#: src/bin/e_int_border_remember.c:242
 msgid "Window properties are not a unique match"
 msgstr "視窗比對屬性並不唯一"
 
-#: src/bin/e_int_border_remember.c:240
+#: src/bin/e_int_border_remember.c:245
 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 "
@@ -1702,11 +1709,11 @@ msgstr ""
 "是,<br>你只需按下<hilight>套用</hilight>或者<hilight>確定</hilight>則你的設"
 "定就會被接受。<br>如果你不確定,按下<hilight>取消</hilight>就全無影響。"
 
-#: src/bin/e_int_border_remember.c:321 src/bin/e_int_border_remember.c:351
+#: src/bin/e_int_border_remember.c:330 src/bin/e_int_border_remember.c:360
 msgid "No match properties set"
 msgstr "未設定比對屬性"
 
-#: src/bin/e_int_border_remember.c:324
+#: src/bin/e_int_border_remember.c:333
 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 "
@@ -1717,7 +1724,7 @@ msgstr ""
 "視窗,卻<hilight>沒有指定如何記住</hilight>他們。<br><br>你必須至少指定一種的"
 "方法來記下此視窗。"
 
-#: src/bin/e_int_border_remember.c:354
+#: src/bin/e_int_border_remember.c:363
 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 "
@@ -1742,119 +1749,119 @@ msgstr ""
 "定</hilight>則你的設定就會被接受。<br>如果你不確定,按下<hilight>取消</"
 "hilight>就全無影響。"
 
-#: src/bin/e_int_border_remember.c:428
+#: src/bin/e_int_border_remember.c:439
 msgid "Nothing"
 msgstr "ç„¡"
 
-#: src/bin/e_int_border_remember.c:430
+#: src/bin/e_int_border_remember.c:441
 msgid "Size and Position"
 msgstr "大小與位置"
 
-#: src/bin/e_int_border_remember.c:432 src/bin/e_int_border_remember.c:502
+#: src/bin/e_int_border_remember.c:443 src/bin/e_int_border_remember.c:513
 msgid "Locks"
 msgstr "鎖定值"
 
-#: src/bin/e_int_border_remember.c:434
+#: src/bin/e_int_border_remember.c:445
 msgid "Size, Position and Locks"
 msgstr "大小、位置與鎖定值"
 
-#: src/bin/e_int_border_remember.c:436
+#: src/bin/e_int_border_remember.c:447
 msgid "Everything"
 msgstr "全部"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:460
 msgid "Remember using"
 msgstr "使用下列特徵來記住視窗:"
 
-#: src/bin/e_int_border_remember.c:455
+#: src/bin/e_int_border_remember.c:466
 msgid "Window name and class"
 msgstr "視窗名稱與類別"
 
-#: src/bin/e_int_border_remember.c:475
+#: src/bin/e_int_border_remember.c:486
 msgid "Window Role"
 msgstr "視窗腳色"
 
-#: src/bin/e_int_border_remember.c:484
+#: src/bin/e_int_border_remember.c:495
 msgid "Window type"
 msgstr "視窗類型"
 
-#: src/bin/e_int_border_remember.c:491
+#: src/bin/e_int_border_remember.c:502
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:495
+#: src/bin/e_int_border_remember.c:506
 msgid "Properties to remember"
 msgstr "記住下列屬性:"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:517
 msgid "Icon Preference"
 msgstr "圖示偏好"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:521
 msgid "Virtual Desktop"
 msgstr "虛擬桌面"
 
-#: src/bin/e_int_border_remember.c:514
+#: src/bin/e_int_border_remember.c:525
 msgid "Current Screen"
 msgstr "目前螢幕"
 
-#: src/bin/e_int_border_remember.c:516
+#: src/bin/e_int_border_remember.c:527
 msgid "Skip Window List"
 msgstr "略過視窗列表"
 
-#: src/bin/e_int_border_remember.c:520
+#: src/bin/e_int_border_remember.c:535
 msgid "Match only one window"
 msgstr "只匹配單一視窗"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:540
 msgid "Start this program on login"
 msgstr "登入時啟動此程式"
 
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:544
 msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:41 src/bin/e_int_menus.c:214
-#: src/modules/battery/e_mod_main.c:183 src/modules/ibar/e_mod_main.c:315
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:214
+#: src/modules/battery/e_mod_main.c:170 src/modules/ibar/e_mod_main.c:315
 #: src/modules/ibar/e_mod_main.c:830 src/modules/ibox/e_mod_main.c:309
-#: src/modules/ibox/e_mod_main.c:704 src/modules/pager/e_mod_main.c:803
-#: src/modules/temperature/e_mod_main.c:312
+#: src/modules/ibox/e_mod_main.c:708 src/modules/pager/e_mod_main.c:803
+#: src/modules/temperature/e_mod_main.c:304
 msgid "Configuration"
 msgstr "組態"
 
-#: src/bin/e_int_config_modules.c:42 src/modules/conf_mime/e_mod_main.c:34
+#: src/bin/e_int_config_modules.c:43 src/modules/conf_mime/e_mod_main.c:34
 #: src/modules/fileman/e_mod_main.c:43 src/modules/fileman/e_mod_main.c:45
 #: src/modules/fileman/e_mod_main.c:57 src/modules/fileman/e_mod_main.c:136
 msgid "File Manager"
 msgstr "檔案管理員"
 
-#: src/bin/e_int_config_modules.c:43
+#: src/bin/e_int_config_modules.c:44
 #, fuzzy
 msgid "Shelf"
 msgstr "置物架 #"
 
-#: src/bin/e_int_config_modules.c:105
+#: src/bin/e_int_config_modules.c:106
 msgid "Module Settings"
 msgstr "設定模組"
 
-#: src/bin/e_int_config_modules.c:167
+#: src/bin/e_int_config_modules.c:168
 msgid "Available Modules"
 msgstr "可用模組"
 
-#: src/bin/e_int_config_modules.c:174
+#: src/bin/e_int_config_modules.c:175
 msgid "Load Module"
 msgstr "載入模組"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:182
 msgid "Loaded Modules"
 msgstr "已載入模組"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:189
 msgid "Unload Module"
 msgstr "卸除模組"
 
-#: src/bin/e_int_config_modules.c:198 src/bin/e_int_config_modules.c:562
-#: src/bin/e_int_config_modules.c:577 src/bin/e_int_config_modules.c:592
+#: src/bin/e_int_config_modules.c:199 src/bin/e_int_config_modules.c:553
+#: src/bin/e_int_config_modules.c:571 src/bin/e_int_config_modules.c:596
 #: src/bin/e_int_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1920,10 +1927,12 @@ msgstr "我的最愛"
 msgid "Applications"
 msgstr "應用程式"
 
-#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1205
+#: src/bin/e_int_menus.c:143 src/bin/e_int_menus.c:1213
 #: src/modules/conf_window_display/e_mod_main.c:34
 #: src/modules/conf_window_focus/e_mod_main.c:34
 #: src/modules/conf_window_manipulation/e_mod_main.c:34
+#: src/modules/conf_window_remembers/e_mod_main.c:14
+#: src/modules/conf_winlist/e_mod_main.c:34
 msgid "Windows"
 msgstr "視窗"
 
@@ -1949,52 +1958,52 @@ msgstr "置物架"
 msgid "Show/Hide All Windows"
 msgstr "顯示/隱藏所有視窗"
 
-#: src/bin/e_int_menus.c:609
+#: src/bin/e_int_menus.c:621
 msgid "(No Applications)"
 msgstr "(無任何應用程式)"
 
-#: src/bin/e_int_menus.c:747
+#: src/bin/e_int_menus.c:761
 msgid "Configure Virtual Desktops"
 msgstr "設定虛擬桌面"
 
-#: src/bin/e_int_menus.c:843
+#: src/bin/e_int_menus.c:854
 msgid "Lock Screen"
 msgstr "鎖定螢幕"
 
-#: src/bin/e_int_menus.c:865
+#: src/bin/e_int_menus.c:876
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_int_menus.c:888
+#: src/bin/e_int_menus.c:899
 msgid "Logout"
 msgstr "登出"
 
-#: src/bin/e_int_menus.c:1211 src/bin/e_int_menus.c:1406
+#: src/bin/e_int_menus.c:1219 src/bin/e_int_menus.c:1409
 msgid "(No Windows)"
 msgstr "(無任何視窗)"
 
-#: src/bin/e_int_menus.c:1261
+#: src/bin/e_int_menus.c:1267
 msgid "Lost Windows"
 msgstr "迷路的視窗"
 
-#: src/bin/e_int_menus.c:1307 src/bin/e_int_menus.c:1419
+#: src/bin/e_int_menus.c:1313 src/bin/e_int_menus.c:1423
 msgid "No name!!"
 msgstr "無名稱!!"
 
-#: src/bin/e_int_menus.c:1512
+#: src/bin/e_int_menus.c:1514
 msgid "(No Shelves)"
 msgstr "(無任何置物架)"
 
-#: src/bin/e_int_menus.c:1526 src/bin/e_shelf.c:1069
+#: src/bin/e_int_menus.c:1527 src/bin/e_shelf.c:1069
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "置物架 #"
 
-#: src/bin/e_int_menus.c:1579
+#: src/bin/e_int_menus.c:1580
 msgid "Add A Shelf"
 msgstr "新增置物架"
 
-#: src/bin/e_int_menus.c:1585
+#: src/bin/e_int_menus.c:1586
 msgid "Delete A Shelf"
 msgstr "移除置物架"
 
@@ -2003,13 +2012,13 @@ msgid "Shelf Configuration"
 msgstr "置物架組態"
 
 #: src/bin/e_int_shelf_config.c:517
-#: src/modules/conf_fonts/e_int_config_fonts.c:249
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
 #: src/bin/e_int_shelf_config.c:519
-#: src/modules/conf_fonts/e_int_config_fonts.c:97
-#: src/modules/conf_fonts/e_int_config_fonts.c:255
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
@@ -2018,12 +2027,12 @@ msgid "Medium"
 msgstr "中"
 
 #: src/bin/e_int_shelf_config.c:523
-#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
 #: src/bin/e_int_shelf_config.c:525
-#: src/modules/conf_fonts/e_int_config_fonts.c:279
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
@@ -2061,7 +2070,7 @@ msgid "%3.0f pixels"
 msgstr "%3.0f 像素"
 
 #: src/bin/e_int_shelf_config.c:605
-#: src/modules/conf_fonts/e_int_config_fonts.c:641
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
 msgid "Styles"
 msgstr "樣式"
 
@@ -2581,7 +2590,7 @@ msgstr "設定置物架"
 msgid "Almost Done"
 msgstr "快好了"
 
-#: src/bin/e_module.c:108
+#: src/bin/e_module.c:120
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2589,11 +2598,11 @@ msgid ""
 msgstr ""
 "載入模組 %s 時發生錯誤。<br>在模組的搜尋路徑<br>沒有找到名為 %s 的模組。<br>"
 
-#: src/bin/e_module.c:112 src/bin/e_module.c:125 src/bin/e_module.c:146
+#: src/bin/e_module.c:124 src/bin/e_module.c:137 src/bin/e_module.c:158
 msgid "Error loading Module"
 msgstr "載入模組時發生錯誤"
 
-#: src/bin/e_module.c:119 src/bin/e_module.c:140
+#: src/bin/e_module.c:131 src/bin/e_module.c:152
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2602,11 +2611,11 @@ msgstr ""
 "載入模組 %s 時發生錯誤。<br>該模組的完整路徑是:<br>%s<br>錯誤報告如下:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:145
+#: src/bin/e_module.c:157
 msgid "Module does not contain all needed functions"
 msgstr "模組並末包含所有必需之功能"
 
-#: src/bin/e_module.c:159
+#: src/bin/e_module.c:171
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2616,12 +2625,12 @@ msgstr ""
 "模組 API 錯誤<br>模組初始化錯誤: %s<br>要求最小的模組 API 版本號: %i。"
 "<br>Enlightenment給的模組版本化: %i。<br>"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:176
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模組"
 
-#: src/bin/e_module.c:480
+#: src/bin/e_module.c:492
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸除這個模組?<br>"
 
@@ -2910,9 +2919,9 @@ msgstr "加入「我的最愛」選單"
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 #: src/modules/conf_imc/e_int_config_imc.c:830
 #: src/modules/conf_startup/e_int_config_startup.c:281
-#: src/modules/conf_theme/e_int_config_theme.c:386
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:498
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:644
+#: src/modules/conf_theme/e_int_config_theme.c:342
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:507
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:633
 msgid "Go up a Directory"
 msgstr "到上一層目錄"
 
@@ -2949,39 +2958,39 @@ msgstr "禁止讀寫"
 msgid "Read-Write"
 msgstr "讀寫"
 
-#: src/modules/battery/e_mod_config.c:38
+#: src/modules/battery/e_mod_config.c:40
 msgid "Battery Monitor Configuration"
 msgstr "電池監控組態"
 
-#: src/modules/battery/e_mod_config.c:82
+#: src/modules/battery/e_mod_config.c:91
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: src/modules/battery/e_mod_config.c:83
-#: src/modules/battery/e_mod_config.c:123
+#: src/modules/battery/e_mod_config.c:92
+#: src/modules/battery/e_mod_config.c:139
 msgid "Show alert when battery is low"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_config.c:115
+#: src/modules/battery/e_mod_config.c:131
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: src/modules/battery/e_mod_config.c:117
+#: src/modules/battery/e_mod_config.c:133
 msgid "Check battery every:"
 msgstr "電量檢查間隔:"
 
-#: src/modules/battery/e_mod_config.c:120
+#: src/modules/battery/e_mod_config.c:136
 #: src/modules/conf_performance/e_int_config_performance.c:133
-#: src/modules/temperature/e_mod_config.c:344
+#: src/modules/temperature/e_mod_config.c:380
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f ç­†"
 
-#: src/modules/battery/e_mod_config.c:126
+#: src/modules/battery/e_mod_config.c:142
 msgid "Alert when battery is down to:"
 msgstr "可用電量低於此時間時發出警告:"
 
-#: src/modules/battery/e_mod_config.c:129
+#: src/modules/battery/e_mod_config.c:145
 #: src/modules/conf_desklock/e_int_config_desklock.c:156
 #: src/modules/conf_dpms/e_int_config_dpms.c:193
 #: src/modules/conf_dpms/e_int_config_dpms.c:201
@@ -2992,70 +3001,52 @@ msgstr "可用電量低於此時間時發出警告:"
 msgid "%1.0f minutes"
 msgstr "%1.0f 分鐘"
 
-#: src/modules/battery/e_mod_config.c:132
+#: src/modules/battery/e_mod_config.c:148
 #, c-format
 msgid "%1.0f percent"
 msgstr "%1.0f%%"
 
-#: src/modules/battery/e_mod_main.c:137
-msgid "Battery"
-msgstr "電池"
-
-#: src/modules/battery/e_mod_main.c:309
-msgid ""
-"Battery Running Low<br>Your battery is running low.<br>You may wish to "
-"switch to an AC source."
-msgstr "電池電量不足<br>您的電池電量不足。<br>您可能需要切換到交流電源"
-
-#: src/modules/battery/e_mod_main.c:355
-msgid "ERROR"
+#: src/modules/battery/e_mod_config.c:151
+msgid "Dismiss alert automatically"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:556 src/modules/battery/e_mod_main.c:873
-#: src/modules/battery/e_mod_main.c:1029
-msgid "N/A"
+#: src/modules/battery/e_mod_config.c:154
+msgid "Dismiss alert after:"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:582 src/modules/battery/e_mod_main.c:1056
-msgid "BAD DRIVER"
-msgstr "錯誤的驅動程式"
-
-#: src/modules/battery/e_mod_main.c:606 src/modules/battery/e_mod_main.c:911
-#: src/modules/battery/e_mod_main.c:1080
-msgid "FULL"
-msgstr "滿"
-
-#: src/modules/battery/e_mod_main.c:667 src/modules/battery/e_mod_main.c:1141
-msgid "High"
-msgstr "高"
-
-#: src/modules/battery/e_mod_main.c:671 src/modules/battery/e_mod_main.c:1145
-msgid "Low"
-msgstr "低"
-
-#: src/modules/battery/e_mod_main.c:675 src/modules/battery/e_mod_main.c:1149
-msgid "Danger"
-msgstr "危險"
+#: src/modules/battery/e_mod_config.c:157
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f 秒"
 
-#: src/modules/battery/e_mod_main.c:679 src/modules/battery/e_mod_main.c:1153
-#: src/modules/battery/e_mod_main.c:1324
-msgid "Charging"
-msgstr "充電中"
+#: src/modules/battery/e_mod_main.c:129
+msgid "Battery"
+msgstr "電池"
 
-#: src/modules/battery/e_mod_main.c:1456
+#: src/modules/battery/e_mod_main.c:417
 #, fuzzy
 msgid "Battery Meter"
 msgstr "電池"
 
-#: src/modules/clock/e_mod_main.c:91
+#: src/modules/battery/e_mod_main.c:494 src/modules/battery/e_mod_main.c:496
+#: src/modules/battery/e_mod_main.c:503 src/modules/battery/e_mod_main.c:505
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:563
+msgid "N/A"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "時鐘"
 
-#: src/modules/conf/e_conf.c:122
+#: src/modules/conf/e_conf.c:122 src/modules/conf/e_conf.c:133
 msgid "Enlightenment Configuration"
 msgstr "Enlightenment 組態"
 
-#: src/modules/conf/e_conf.c:159
+#: src/modules/conf/e_conf.c:161
 msgid "Items"
 msgstr "é …ç›®"
 
@@ -3086,7 +3077,7 @@ msgid "Restart Applications"
 msgstr "自動重新啟動之應用程式"
 
 #: src/modules/conf_applications/e_int_config_apps.c:238
-#: src/modules/fileman/e_fwin.c:1348
+#: src/modules/fileman/e_fwin.c:1361
 msgid "All Applications"
 msgstr "全部應用程式"
 
@@ -3144,7 +3135,7 @@ msgstr "以下列方式分為群組:"
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:101
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:114
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:124
-#: src/modules/conf_fonts/e_int_config_fonts.c:669
+#: src/modules/conf_fonts/e_int_config_fonts.c:676
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:369
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3246,7 +3237,7 @@ msgid "Error Text"
 msgstr "錯誤文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#: src/modules/conf_fonts/e_int_config_fonts.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
 msgstr "選單標題"
 
@@ -3255,7 +3246,7 @@ msgid "Menu Title Active"
 msgstr "作用中選單標題"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#: src/modules/conf_fonts/e_int_config_fonts.c:60
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
 msgstr "選單項目"
 
@@ -3264,12 +3255,12 @@ msgid "Menu Item Active"
 msgstr "作用中選單項目"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#: src/modules/conf_fonts/e_int_config_fonts.c:65
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
 msgstr "移動文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
-#: src/modules/conf_fonts/e_int_config_fonts.c:66
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
 msgstr "改變大小文字"
 
@@ -3282,12 +3273,12 @@ msgid "Winlist Label"
 msgstr "視窗列表標籤"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
-#: src/modules/conf_fonts/e_int_config_fonts.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
 msgstr "視窗列表標題"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:64
-#: src/modules/conf_fonts/e_int_config_fonts.c:80
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
 msgstr "Widgets"
 
@@ -3324,7 +3315,7 @@ msgid "List Item Odd Text"
 msgstr "奇數列表項目文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#: src/modules/conf_fonts/e_int_config_fonts.c:90
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
 msgstr "列表標頭"
 
@@ -3410,6 +3401,7 @@ msgstr "桌面名稱"
 #: src/modules/conf_desk/e_int_config_desk.c:150
 #: src/modules/conf_profiles/e_int_config_profiles.c:265
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:102
 msgid "Name:"
 msgstr "名稱:"
 
@@ -3451,10 +3443,10 @@ msgstr "超過此時間時視為閒置:"
 #: src/modules/conf_desklock/e_int_config_desklock.c:192
 #: src/modules/conf_imc/e_int_config_imc.c:818
 #: src/modules/conf_startup/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:375
-#: src/modules/conf_theme/e_int_config_theme.c:844
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:488
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:634
+#: src/modules/conf_theme/e_int_config_theme.c:331
+#: src/modules/conf_theme/e_int_config_theme.c:763
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:497
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:623
 msgid "Personal"
 msgstr "個人"
 
@@ -3787,12 +3779,12 @@ msgstr "啟用 Composite"
 msgid "Default Engine"
 msgstr "預設引擎"
 
-#: src/modules/conf_engine/e_int_config_engine.c:121
+#: src/modules/conf_engine/e_int_config_engine.c:122
 #, fuzzy
 msgid "Enable Composite Support ?"
 msgstr "啟用 Composite"
 
-#: src/modules/conf_engine/e_int_config_engine.c:123
+#: src/modules/conf_engine/e_int_config_engine.c:124
 msgid ""
 "You have chosen to enable composite support,<br>but your current screen does "
 "not support composite.<br><br>Are you sure you wish to enable composite "
@@ -3916,192 +3908,197 @@ msgstr "Y-軸排列"
 msgid "Run Command"
 msgstr "執行指令"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
 msgstr "核心"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:59
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
 msgstr "標題列"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:62
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
 msgstr "文字區塊 (一般)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:63
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
 msgstr "文字區塊 (淡)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:64
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
 msgstr "文字區塊 (大)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:68
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Configure Heading"
 msgstr "組態標題"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:69
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
 msgstr "「關於」標題"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr "「關於」版本"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:71
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
 msgstr "「關於」文字"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:72
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
 msgstr "「桌面鎖定」標題"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:73
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
 msgstr "「桌面鎖定」密碼"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:74
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
 msgstr "對話方塊錯誤"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:75
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
 msgstr "Exebuf 命令"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
 msgstr "啟動畫面標題"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:77
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
 msgstr "啟動畫面文字"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:78
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
 msgstr "啟動畫面版本"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:81
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr "輸入欄"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:82
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
 msgstr "框架"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:83
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
 msgstr "標籤"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:84
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
 msgstr "按鈕"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:85
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
 msgstr "滑尺"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
 msgstr "單選按鈕"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:87
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
 msgstr "核取方塊"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:88
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
 msgstr "文字列表項目"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:89
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
 msgstr "列表項目"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:92
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
 msgstr "檔案管理員"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:93
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr "類型緩衝"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+#, fuzzy
+msgid "Desktop Icon"
+msgstr "顯示桌面圖示"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr "「小」樣式"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:101
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
 msgstr "「正常」樣式"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:102
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr "「大」樣式"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:165
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
 msgstr "字型設定"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:267
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
 msgstr "大"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:273
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
 msgstr "真的很大"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:288
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
 msgstr "%d 像素"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:447
 msgid "Enable Custom Font Classes"
 msgstr "啟用自訂字型類別"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:448
-#: src/modules/conf_fonts/e_int_config_fonts.c:633
+#: src/modules/conf_fonts/e_int_config_fonts.c:454
+#: src/modules/conf_fonts/e_int_config_fonts.c:640
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "å­—åž‹"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:464
+#: src/modules/conf_fonts/e_int_config_fonts.c:471
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basic preview text: 123: 我的天空!"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:624
 msgid "Font Classes"
 msgstr "字型類別"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:626
+#: src/modules/conf_fonts/e_int_config_fonts.c:633
 msgid "Enable Font Class"
 msgstr "啟用字型類別"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:658
+#: src/modules/conf_fonts/e_int_config_fonts.c:665
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:668
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:665
+#: src/modules/conf_fonts/e_int_config_fonts.c:672
 #: src/modules/cpufreq/e_mod_main.c:222
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:681
 msgid "Font Fallbacks"
 msgstr "備用字型"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:675
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Fallback Name"
 msgstr "備用字型名稱"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:688
+#: src/modules/conf_fonts/e_int_config_fonts.c:695
 msgid "Enable Fallbacks"
 msgstr "啟用備用字型"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:696
+#: src/modules/conf_fonts/e_int_config_fonts.c:703
 msgid "Advanced Preview Text.. 我真的会写中文"
 msgstr "Advanced Preview Text.. 我真的会写中文"
 
@@ -4140,7 +4137,7 @@ msgid "New"
 msgstr "新增"
 
 #: src/modules/conf_imc/e_int_config_imc.c:899
-#: src/modules/conf_theme/e_int_config_theme.c:444
+#: src/modules/conf_theme/e_int_config_theme.c:371
 msgid "Import..."
 msgstr "匯入..."
 
@@ -4188,22 +4185,64 @@ msgstr "語言"
 msgid "Input Method Settings"
 msgstr "輸入法設定"
 
+#: src/modules/conf_interaction/e_int_config_interaction.c:35
+#, fuzzy
+msgid "Interaction Settings"
+msgstr "選取設定"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:84
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:88
+msgid "Threshhold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:91
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f 像素"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:95
+msgid "Threshhold for for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:98
+#, fuzzy, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%5.0f 像素/秒"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:102
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#, fuzzy, c-format
+msgid "%1.2f sec"
+msgstr "%1.1f 秒"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+#, fuzzy
+msgid "Interaction"
+msgstr "Interlingua"
+
 #: src/modules/conf_intl/e_int_config_intl.c:582
 msgid "Language Configuration"
 msgstr "語言組態"
 
-#: src/modules/conf_intl/e_int_config_intl.c:892
-#: src/modules/conf_intl/e_int_config_intl.c:969
+#: src/modules/conf_intl/e_int_config_intl.c:894
+#: src/modules/conf_intl/e_int_config_intl.c:971
 msgid "Language Selector"
 msgstr "語言選擇器"
 
-#: src/modules/conf_intl/e_int_config_intl.c:942
-#: src/modules/conf_intl/e_int_config_intl.c:1020
+#: src/modules/conf_intl/e_int_config_intl.c:944
+#: src/modules/conf_intl/e_int_config_intl.c:1022
 msgid "Locale Selected"
 msgstr "選取的 Locale"
 
-#: src/modules/conf_intl/e_int_config_intl.c:943
-#: src/modules/conf_intl/e_int_config_intl.c:1021
+#: src/modules/conf_intl/e_int_config_intl.c:945
+#: src/modules/conf_intl/e_int_config_intl.c:1023
 msgid "Locale"
 msgstr "Locale"
 
@@ -4519,11 +4558,6 @@ msgstr "使用 X 游標"
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:154
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f 像素"
-
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr "滑鼠游標"
@@ -4558,7 +4592,7 @@ msgid "Images"
 msgstr "圖片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1072
+#: src/modules/conf_theme/e_int_config_theme.c:981
 msgid "Themes"
 msgstr "佈景主題"
 
@@ -4715,11 +4749,6 @@ msgstr "在此時間後啟動 X 螢幕保護程式"
 msgid "Time until X screensaver alternates"
 msgstr "在此時間後變換 X 螢幕保護程式"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:162
 msgid "Blanking"
 msgstr "空白"
@@ -4776,23 +4805,23 @@ msgstr "登入時顯示啟動畫面"
 msgid "Startup"
 msgstr "å•Ÿå‹•"
 
-#: src/modules/conf_theme/e_int_config_theme.c:60
+#: src/modules/conf_theme/e_int_config_theme.c:59
 msgid "Theme Selector"
 msgstr "佈景主題選擇器"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1063
+#: src/modules/conf_theme/e_int_config_theme.c:972
 msgid "Theme Categories"
 msgstr "佈景主題分類"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1081
+#: src/modules/conf_theme/e_int_config_theme.c:990
 msgid "Assign"
 msgstr "指定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1084
+#: src/modules/conf_theme/e_int_config_theme.c:993
 msgid "Clear"
 msgstr "清除"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1087
+#: src/modules/conf_theme/e_int_config_theme.c:996
 msgid "Clear All"
 msgstr "全部清除"
 
@@ -4837,38 +4866,43 @@ msgstr "背景改變"
 msgid "Transitions"
 msgstr "轉換"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:109
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:108
 msgid "Wallpaper Settings"
 msgstr "桌布設定"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:697
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:534
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:658
 msgid "Use Theme Wallpaper"
 msgstr "使用佈景主題桌布"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:555
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:701
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:539
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:663
 msgid "Picture..."
 msgstr "圖片..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:558
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:704
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:542
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:666
 msgid "Gradient..."
 msgstr "漸層..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:722
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:547
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:671
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Where to place the Wallpaper"
 msgstr "將桌布置於"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:691
 msgid "All Desktops"
 msgstr "所有桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:725
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:693
 msgid "This Desktop"
 msgstr "此桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:727
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:695
 msgid "This Screen"
 msgstr "此螢幕"
 
@@ -4918,7 +4952,7 @@ msgstr "產生漸層時發生錯誤"
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Enlightenment 無法產生漸層。"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:107
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:106
 msgid "Select a Picture..."
 msgstr "選擇圖片..."
 
@@ -4968,22 +5002,79 @@ msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "轉檔時發生錯誤,Enlightenment 無法匯入此圖片。"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:580
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:597
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:578
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:595
 msgid "Wallpaper Import Error"
 msgstr "匯入桌布時發生錯誤"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:581
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:579
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "複製檔案時發生錯誤,Enlightenment 無法匯入此桌布。"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:598
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:596
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr "Enlightenment 無法匯入此桌布。您是否確定這是合法的桌布?"
 
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:97
+msgid "Choose a website from list..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:111
+msgid "get-e.org - Static"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:114
+msgid "get-e.org  - Animated"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:244
+#, c-format
+msgid "[%s] Getting feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:252
+#, c-format
+msgid "[%s] Getting feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:375
+#, c-format
+msgid "[%s] Parsing feed... DONE!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:383
+#, c-format
+msgid "[%s] Parsing feed... FAILED!"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:501
+#, c-format
+msgid "[%s] Downloading of edje file..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:535
+#, c-format
+msgid "[%s] Download %d images of %d"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:549
+#, c-format
+msgid "[%s] Choose an image from list"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:573
+#, c-format
+msgid "[%s] Downloading of edje file... %d%% done"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:608
+#, c-format
+msgid "[%s] Getting feed..."
+msgstr ""
+
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
 #: src/modules/conf_wallpaper/e_mod_main.c:96
@@ -5273,6 +5364,62 @@ msgstr "允許視窗操作"
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "當置物架自動隱藏時移動或改變視窗大小"
 
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:89
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+#, fuzzy
+msgid "Window Remembers"
+msgstr "記住視窗"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:91
+#, fuzzy
+msgid "Delete Remember(s)"
+msgstr "設定記憶值"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:101
+#, fuzzy
+msgid "Details"
+msgstr "預設值"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:104
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:233
+#, fuzzy
+msgid "<No Name>"
+msgstr "圖示名稱"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:107
+#, fuzzy
+msgid "Class:"
+msgstr "類別"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:109
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:235
+#, fuzzy
+msgid "<No Class>"
+msgstr "類別"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:112
+#, fuzzy
+msgid "Title:"
+msgstr "標題"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:114
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:237
+#, fuzzy
+msgid "<No Title>"
+msgstr "標題"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#, fuzzy
+msgid "Role:"
+msgstr "角色"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:239
+#, fuzzy
+msgid "<No Role>"
+msgstr "<ç„¡>"
+
 #: src/modules/conf_winlist/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "視窗列表設定"
@@ -5623,19 +5770,19 @@ msgstr "陰影顏色"
 msgid "Go to Parent Directory"
 msgstr "到上一層目錄"
 
-#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1307
+#: src/modules/fileman/e_fwin.c:680 src/modules/fileman/e_fwin.c:1320
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1305
+#: src/modules/fileman/e_fwin.c:687 src/modules/fileman/e_fwin.c:1318
 msgid "Open with..."
 msgstr "以特定程式開啟..."
 
-#: src/modules/fileman/e_fwin.c:1323
+#: src/modules/fileman/e_fwin.c:1336
 msgid "Specific Applications"
 msgstr "特定應用程式"
 
-#: src/modules/fileman/e_fwin.c:1394
+#: src/modules/fileman/e_fwin.c:1407
 #, fuzzy
 msgid "Custom Command"
 msgstr "執行指令"
@@ -5927,7 +6074,7 @@ msgstr "切換到上方桌面"
 msgid "Popup Desk Down"
 msgstr "切換到下方桌面"
 
-#: src/modules/start/e_mod_main.c:103
+#: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "開始"
 
@@ -5935,111 +6082,111 @@ msgstr "開始"
 msgid "Temperature Configuration"
 msgstr "溫度組態"
 
-#: src/modules/temperature/e_mod_config.c:213
-#: src/modules/temperature/e_mod_config.c:316
+#: src/modules/temperature/e_mod_config.c:249
+#: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
 msgstr "顯示單位"
 
-#: src/modules/temperature/e_mod_config.c:215
-#: src/modules/temperature/e_mod_config.c:318
+#: src/modules/temperature/e_mod_config.c:251
+#: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
 msgstr "攝氏"
 
-#: src/modules/temperature/e_mod_config.c:217
-#: src/modules/temperature/e_mod_config.c:320
+#: src/modules/temperature/e_mod_config.c:253
+#: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
 msgstr "華氏"
 
-#: src/modules/temperature/e_mod_config.c:221
-#: src/modules/temperature/e_mod_config.c:343
+#: src/modules/temperature/e_mod_config.c:257
+#: src/modules/temperature/e_mod_config.c:379
 msgid "Check Interval"
 msgstr "檢查間隔"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:259
 msgid "Fast"
 msgstr "å¿«"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:263
 msgid "Slow"
 msgstr "æ…¢"
 
-#: src/modules/temperature/e_mod_config.c:229
+#: src/modules/temperature/e_mod_config.c:265
 msgid "Very Slow"
 msgstr "很慢"
 
-#: src/modules/temperature/e_mod_config.c:236
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:361
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:272
+#: src/modules/temperature/e_mod_config.c:296
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:409
 msgid "High Temperature"
 msgstr "高温"
 
-#: src/modules/temperature/e_mod_config.c:239
+#: src/modules/temperature/e_mod_config.c:275
 msgid "200 F"
 msgstr "200 F"
 
-#: src/modules/temperature/e_mod_config.c:241
+#: src/modules/temperature/e_mod_config.c:277
 msgid "150 F"
 msgstr "150 F"
 
-#: src/modules/temperature/e_mod_config.c:243
-#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:279
+#: src/modules/temperature/e_mod_config.c:288
 msgid "110 F"
 msgstr "110 F"
 
-#: src/modules/temperature/e_mod_config.c:247
-#: src/modules/temperature/e_mod_config.c:271
-#: src/modules/temperature/e_mod_config.c:366
-#: src/modules/temperature/e_mod_config.c:378
+#: src/modules/temperature/e_mod_config.c:283
+#: src/modules/temperature/e_mod_config.c:307
+#: src/modules/temperature/e_mod_config.c:402
+#: src/modules/temperature/e_mod_config.c:414
 msgid "Low Temperature"
 msgstr "低溫"
 
-#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:286
 msgid "130 F"
 msgstr "130 F"
 
-#: src/modules/temperature/e_mod_config.c:254
+#: src/modules/temperature/e_mod_config.c:290
 msgid "90 F"
 msgstr "90 F"
 
-#: src/modules/temperature/e_mod_config.c:263
+#: src/modules/temperature/e_mod_config.c:299
 msgid "93 C"
 msgstr "93 C"
 
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:301
 msgid "65 C"
 msgstr "65 C"
 
-#: src/modules/temperature/e_mod_config.c:267
-#: src/modules/temperature/e_mod_config.c:276
+#: src/modules/temperature/e_mod_config.c:303
+#: src/modules/temperature/e_mod_config.c:312
 msgid "43 C"
 msgstr "43 C"
 
-#: src/modules/temperature/e_mod_config.c:274
+#: src/modules/temperature/e_mod_config.c:310
 msgid "55 C"
 msgstr "55 C"
 
-#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:314
 msgid "32 C"
 msgstr "32 C"
 
-#: src/modules/temperature/e_mod_config.c:331
+#: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
 msgstr "感應器"
 
-#: src/modules/temperature/e_mod_config.c:362
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:398
+#: src/modules/temperature/e_mod_config.c:403
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f F"
 
-#: src/modules/temperature/e_mod_config.c:374
-#: src/modules/temperature/e_mod_config.c:379
+#: src/modules/temperature/e_mod_config.c:410
+#: src/modules/temperature/e_mod_config.c:415
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:161
+#: src/modules/temperature/e_mod_main.c:153
 msgid "Temperature"
 msgstr "温度"
 
@@ -6060,6 +6207,29 @@ msgstr "上一步"
 msgid "Choose Language"
 msgstr "語言"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr "電池電量不足<br>您的電池電量不足。<br>您可能需要切換到交流電源"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "錯誤的驅動程式"
+
+#~ msgid "FULL"
+#~ msgstr "滿"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgid "Danger"
+#~ msgstr "危險"
+
+#~ msgid "Charging"
+#~ msgstr "充電中"
+
 #~ msgid "NO INFO"
 #~ msgstr "沒有資訊"
 
@@ -6249,9 +6419,6 @@ msgstr "語言"
 #~ msgid "Armenian"
 #~ msgstr "Armenian"
 
-#~ msgid "Interlingua"
-#~ msgstr "Interlingua"
-
 #~ msgid "Indonesian"
 #~ msgstr "印尼文"
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 08ccac2..771e6f8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -72,6 +72,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -84,6 +86,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +106,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -128,6 +133,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 517e91a..9601fe5 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -159,7 +159,10 @@ e_config_data.h \
 e_intl_data.h \
 e_toolbar.h \
 e_int_toolbar_config.h \
-e_powersave.h
+e_powersave.h \
+e_slidesel.h \
+e_slidecore.h \
+e_widget_flist.h
 
 enlightenment_src = \
 e_user.c \
@@ -292,6 +295,9 @@ e_fm_custom.c \
 e_toolbar.c \
 e_int_toolbar_config.c \
 e_powersave.c \
+e_slidesel.c \
+e_slidecore.c \
+e_widget_flist.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_SOURCES = \
diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
index 880a0ea..0f2021c 100644
--- a/src/bin/Makefile.in
+++ b/src/bin/Makefile.in
@@ -113,7 +113,9 @@ am__objects_2 = e_user.$(OBJEXT) e_manager.$(OBJEXT) e_path.$(OBJEXT) \
 	e_order.$(OBJEXT) e_exec.$(OBJEXT) \
 	e_widget_font_preview.$(OBJEXT) e_fm_custom.$(OBJEXT) \
 	e_toolbar.$(OBJEXT) e_int_toolbar_config.$(OBJEXT) \
-	e_powersave.$(OBJEXT) $(am__objects_1)
+	e_powersave.$(OBJEXT) e_slidesel.$(OBJEXT) \
+	e_slidecore.$(OBJEXT) e_widget_flist.$(OBJEXT) \
+	$(am__objects_1)
 am_enlightenment_OBJECTS = e_main.$(OBJEXT) $(am__objects_2)
 enlightenment_OBJECTS = $(am_enlightenment_OBJECTS)
 enlightenment_LDADD = $(LDADD)
@@ -185,6 +187,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -197,6 +201,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -216,6 +221,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -241,6 +248,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -479,7 +487,10 @@ e_config_data.h \
 e_intl_data.h \
 e_toolbar.h \
 e_int_toolbar_config.h \
-e_powersave.h
+e_powersave.h \
+e_slidesel.h \
+e_slidecore.h \
+e_widget_flist.h
 
 enlightenment_src = \
 e_user.c \
@@ -612,6 +623,9 @@ e_fm_custom.c \
 e_toolbar.c \
 e_int_toolbar_config.c \
 e_powersave.c \
+e_slidesel.c \
+e_slidecore.c \
+e_widget_flist.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_SOURCES = \
@@ -845,7 +859,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_sha1.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_shelf.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_signals.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_slidecore.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_slider.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_slidesel.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_spectrum.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_start_main.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_startup.Po at am__quote@
@@ -872,6 +888,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_cslider.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_desk_preview.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_entry.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_flist.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_font_preview.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_framelist.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_widget_frametable.Po at am__quote@
diff --git a/src/bin/e.h b/src/bin/e.h
index 5afc2fd..fb5ce84 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -140,6 +140,32 @@ typedef struct _E_Rect E_Rect;
   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)) \
+	{ \
+	   if (_x < (_cx)) \
+	     { \
+		_w += _x - (_cx); \
+		_x = (_cx); \
+		if (_w < 0) _w = 0; \
+	     } \
+	   if ((_x + _w) > ((_cx) + (_cw))) \
+	     _w = (_cx) + (_cw) - _x; \
+	   if (_y < (_cy)) \
+	     { \
+		_h += _y - (_cy); \
+		_y = (_cy); \
+		if (_h < 0) _h = 0; \
+	     } \
+	   if ((_y + _h) > ((_cy) + (_ch))) \
+	     _h = (_cy) + (_ch) - _y; \
+	} \
+      else \
+	{ \
+	   _w = 0; _h = 0; \
+	} \
+   }
 
 #define E_REMOTE_OPTIONS 1
 #define E_REMOTE_OUT     2
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 8d54f99..e81f150 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -304,7 +304,7 @@ ACT_FN_GO(window_kill)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_kill_dialog_ok (obj, NULL);
+	_e_actions_cb_kill_dialog_ok(obj, NULL);
 	return;
      }
 
@@ -1478,15 +1478,15 @@ ACT_FN_GO_KEY(menu_show)
 /***************************************************************************/
 ACT_FN_GO(exec)
 {
-   if (params)
+   E_Zone *zone;
+   
+   zone = _e_actions_zone_get(obj);
+   if (zone)
      {
-	Ecore_Exe *exe;
-
-	e_util_library_path_strip();
-	exe = ecore_exe_run(params, NULL);
-	e_util_library_path_restore();
-	e_exehist_add("action/exec", params);
-	if (exe) ecore_exe_free(exe);
+	if (params)
+	  {
+	     e_exec(zone, NULL, params, NULL, "action/exec");
+	  }
      }
 }
 
@@ -1583,7 +1583,7 @@ ACT_FN_GO(exit)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_exit_dialog_ok (NULL, NULL);
+	_e_actions_cb_exit_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1654,7 +1654,7 @@ ACT_FN_GO(logout)
    
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_logout_dialog_ok (NULL, NULL);
+	_e_actions_cb_logout_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1713,7 +1713,7 @@ ACT_FN_GO(halt)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_halt_dialog_ok (NULL, NULL);
+	_e_actions_cb_halt_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1772,7 +1772,7 @@ ACT_FN_GO(reboot)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_reboot_dialog_ok (NULL, NULL);
+	_e_actions_cb_reboot_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1831,7 +1831,7 @@ ACT_FN_GO(suspend)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_suspend_dialog_ok (NULL, NULL);
+	_e_actions_cb_suspend_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1890,7 +1890,7 @@ ACT_FN_GO(hibernate)
 
    if (e_config->cnfmdlg_disabled)
      {
-	_e_actions_cb_hibernate_dialog_ok (NULL, NULL);
+	_e_actions_cb_hibernate_dialog_ok(NULL, NULL);
 	return;
      }
 
@@ -1925,7 +1925,8 @@ ACT_FN_GO(pointer_resize_push)
 	bd = (E_Border *)obj;
 	if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
 	    (bd->fullscreen) || 
-		((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
+	    ((bd->maximized == E_MAXIMIZE_FULLSCREEN) &&
+	     (!e_config->allow_manip)))
 	  return;
 	if (bd->zone)
 	  man = bd->zone->container->manager;
diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h
index 581f4d7..d19a8b9 100644
--- a/src/bin/e_actions.h
+++ b/src/bin/e_actions.h
@@ -54,7 +54,7 @@ EAPI E_Action   *e_action_add(const char *name);
 EAPI void	e_action_del(const char *name);
 EAPI E_Action   *e_action_find(const char *name);
 
-EAPI void       e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable); 
+EAPI void       e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable);
 EAPI void       e_action_predef_name_del(const char *act_grp, const char *act_name);
 EAPI void       e_action_predef_name_all_del(void);
 EAPI Evas_List  *e_action_groups_get(void);
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 3f6ac94..69e490a 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -59,6 +59,7 @@ e_bindings_init(void)
 	  {
 	     char params[32];
 	     snprintf(params, sizeof(params), "resize_%s", eb->params);
+	     printf("########## ADD mouse,in + mouse,out\n");
 	     e_bindings_signal_add(eb->context, "mouse,in", eb->source, eb->modifiers,
 				   eb->any_mod, "pointer_resize_push", params);
 	     e_bindings_signal_add(eb->context, "mouse,out", eb->source, eb->modifiers,
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 47142f8..5817137 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -419,6 +419,14 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
 		       bd->client.e.fetch.state = 1;
 		    }
 	       }
+	     /* loop to check for qtopia atoms */
+	     for (i = 0; i < at_num; i++)
+	       {
+		  if (atoms[i] == _QTOPIA_SOFT_MENU)
+		    bd->client.qtopia.fetch.soft_menu = 1;
+		  else if (atoms[i] == _QTOPIA_SOFT_MENUS)
+		    bd->client.qtopia.fetch.soft_menus = 1;
+	       }
 	     free(atoms);
 	  }
      }
@@ -1353,6 +1361,17 @@ e_border_raise_latest_set(E_Border *bd)
 EAPI void
 e_border_focus_set_with_pointer(E_Border *bd)
 {
+   /* note: this is here as it seems there are enough apps that do not even
+    * expect us to emulate a look of focus but not actually set x input
+    * focus as we do - so simply abort any focuse set on such windows */
+   /* be strict about accepting focus hint */
+//   printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
+   if (!bd->client.icccm.accepts_focus) return;
+   
+   /* Try to grab the pointer to make sure it's not "in use" */
+   if (!ecore_x_pointer_grab(bd->zone->container->win))
+     return;
+
    if (e_config->focus_policy == E_FOCUS_SLOPPY)
      {
 	if (e_border_under_pointer_get(bd->desk, bd))
@@ -1368,6 +1387,8 @@ e_border_focus_set_with_pointer(E_Border *bd)
    else
      if (!e_border_pointer_warp_to_center(bd))
        e_border_focus_set(bd, 1, 1);
+
+   ecore_x_pointer_ungrab();
 }
 
 EAPI void
@@ -1375,7 +1396,16 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 {
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   //printf("e_border_focus_set(%p, %i %i);\n", bd, focus, set);
+   /* note: this is here as it seems there are enough apps that do not even
+    * expect us to emulate a look of focus but not actually set x input
+    * focus as we do - so simply abort any focuse set on such windows */
+   /* be strict about accepting focus hint */
+//   printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set);
+//   printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
+   if (!bd->client.icccm.accepts_focus) return;
+   /* dont focus an iconified window. that's silly! */
+   if ((focus) && (bd->iconic)) return;
+   
    if ((bd->modal) && (bd->modal != bd))
      {
 	e_border_focus_set(bd->modal, focus, set);
@@ -1395,14 +1425,17 @@ e_border_focus_set(E_Border *bd, int focus, int set)
      {
 	if ((bd->visible) && (bd->changes.visible))
 	  {
+	     e_border_focus_latest_set(bd);
 	     bd->want_focus = 1;
 	     bd->changed = 1;
 	     return;
 	  }
-	if (bd->visible)
+//	if (bd->visible)
 	  {
 	     if (focus_track_frozen == 0)
-	       e_border_focus_latest_set(bd);
+	       {
+		  e_border_focus_latest_set(bd);
+	       }
 	  }
 //	printf("EMIT 0x%x activeve\n", bd->client.win);
 	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
@@ -2259,6 +2292,7 @@ e_border_stick(E_Border *bd)
 	  }
      }
 
+   edje_object_signal_emit(bd->bg_object, "e,state,sticky", "e");
    ev = E_NEW(E_Event_Border_Stick, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
@@ -2294,6 +2328,7 @@ e_border_unstick(E_Border *bd)
 	  }
      }
 
+   edje_object_signal_emit(bd->bg_object, "e,state,unsticky", "e");
    ev = E_NEW(E_Event_Border_Unstick, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
@@ -3244,6 +3279,8 @@ _e_border_free(E_Border *bd)
 	  free(bd->client.netwm.icons[i].data);
 	free(bd->client.netwm.icons);
      }
+   if (bd->client.netwm.extra_types)
+     free(bd->client.netwm.extra_types);
    if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
    if (bd->bordername) evas_stringshare_del(bd->bordername);
    if (bd->client.icccm.title) free(bd->client.icccm.title);
@@ -3949,6 +3986,16 @@ _e_border_cb_window_property(void *data, int ev_type, void *ev)
 	bd->client.netwm.fetch.icon = 1;
 	bd->changed = 1;
      }
+   else if (e->atom == _QTOPIA_SOFT_MENU)
+     {
+	bd->client.qtopia.fetch.soft_menu = 1;
+	bd->changed = 1;
+     }
+   else if (e->atom == _QTOPIA_SOFT_MENUS)
+     {
+	bd->client.qtopia.fetch.soft_menus = 1;
+	bd->changed = 1;
+     }
    /*
    else if (e->atom == ECORE_X_ATOM_NET_WM_USER_TIME)
      {
@@ -5032,6 +5079,7 @@ _e_border_eval(E_Border *bd)
    int rem_change = 0;
    int send_event = 1;
    
+   _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd);
    /* fetch any info queued to be fetched */
    if (bd->client.icccm.fetch.client_leader)
      {
@@ -5161,7 +5209,6 @@ _e_border_eval(E_Border *bd)
 
 	if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK)
 	  {
-	     /* TODO: Make this user options */
 	     if (!bd->client.netwm.state.skip_pager)
 	       {
 		  bd->client.netwm.state.skip_pager = 1;
@@ -5429,6 +5476,18 @@ _e_border_eval(E_Border *bd)
 	  }
 	bd->client.netwm.fetch.strut = 0;
      }
+   if (bd->client.qtopia.fetch.soft_menu)
+     {
+	e_hints_window_qtopia_soft_menu_get(bd);
+	bd->client.qtopia.fetch.soft_menu = 0;
+	rem_change = 1;
+     }
+   if (bd->client.qtopia.fetch.soft_menus)
+     {
+	e_hints_window_qtopia_soft_menus_get(bd);
+	bd->client.qtopia.fetch.soft_menus = 0;
+	rem_change = 1;
+     }
    if (bd->changes.shape)
      {
 	Ecore_X_Rectangle *rects;
@@ -5782,6 +5841,10 @@ _e_border_eval(E_Border *bd)
 	       }
 	     if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
 	       bd->user_skip_winlist = rem->prop.skip_winlist;
+	     if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)
+	       bd->client.netwm.state.skip_pager = rem->prop.skip_pager;
+	     if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR)
+	       bd->client.netwm.state.skip_taskbar = rem->prop.skip_taskbar;
 	     if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)
 	       bd->icon_preference = rem->prop.icon_preference;
 	     if (rem->apply & E_REMEMBER_SET_FOCUS_ON_START)
@@ -5790,6 +5853,7 @@ _e_border_eval(E_Border *bd)
      }
 
    _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
+   _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
    
    if ((bd->client.border.changed) && (!bd->shaded) &&
        (!(((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))))
@@ -5926,6 +5990,8 @@ _e_border_eval(E_Border *bd)
 		    }
 		  if (bd->shaded)
 		    edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
+		  if (bd->sticky)
+		    edje_object_signal_emit(bd->bg_object, "e,state,sticky", "e");
 		  if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN)
 		    edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
 		  else if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
@@ -5966,6 +6032,9 @@ _e_border_eval(E_Border *bd)
 	bd->need_reparent = 0;
      }
    
+   _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN, bd);
+   _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_NEW_BORDER, bd);
+   
    if (bd->new_client)
      {
 //	printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win);
@@ -6186,6 +6255,8 @@ _e_border_eval(E_Border *bd)
 	  }
      }
    
+   _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_NEW_BORDER, bd);
+   
    /* effect changes to the window border itself */
    if ((bd->changes.shading))
      {
@@ -6809,6 +6880,7 @@ _e_border_eval(E_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);
 }
 
 static void
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index d3d9ccb..e85b585 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -80,7 +80,13 @@ typedef enum _E_Window_Placement
 
 typedef enum _E_Border_Hook_Point
 {
-   E_BORDER_HOOK_EVAL_POST_FETCH
+   E_BORDER_HOOK_EVAL_PRE_FETCH,
+   E_BORDER_HOOK_EVAL_POST_FETCH,
+   E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN,
+   E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
+   E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
+   E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
+   E_BORDER_HOOK_EVAL_END,
 } E_Border_Hook_Point;
 
 typedef struct _E_Border                     E_Border;
@@ -296,6 +302,8 @@ struct _E_Border
          } action;
 
 	 Ecore_X_Window_Type type;
+	 Ecore_X_Window_Type *extra_types;
+	 int extra_types_num;
 	 int startup_id;
 
 	 struct {
@@ -329,6 +337,16 @@ struct _E_Border
 	    unsigned char state : 1;
 	 } fetch;
       } e;
+      
+      struct {
+	 struct {
+	    unsigned char soft_menu : 1;
+	    unsigned char soft_menus : 1;
+	 } fetch;
+	 
+	 unsigned char soft_menu : 1;
+	 unsigned char soft_menus : 1;
+      } qtopia;
 
       Ecore_X_Window_Attributes initial_attributes;
    } client;
diff --git a/src/bin/e_box.c b/src/bin/e_box.c
index e1c8791..f610a86 100644
--- a/src/bin/e_box.c
+++ b/src/bin/e_box.c
@@ -99,8 +99,7 @@ e_box_orientation_set(Evas_Object *obj, int horizontal)
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   if (((sd->horizontal) && (horizontal)) ||
-       ((!sd->horizontal) && (!horizontal))) return;
+   if (sd->horizontal == horizontal) return;
    sd->horizontal = horizontal;
    sd->changed = 1;
    if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
@@ -486,10 +485,12 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
 		       hh = h;
 		       ow = bi->min.w;
 		       if (bi->fill_w) ow = ww;
-		       if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
+		       if ((bi->max.w >= 0) && (bi->max.w < ow)) 
+                         ow = bi->max.w;
 		       oh = bi->min.h;
 		       if (bi->fill_h) oh = hh;
-		       if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
+		       if ((bi->max.h >= 0) && (bi->max.h < oh)) 
+                         oh = bi->max.h;
 		       evas_object_move(obj, 
 					xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
 					yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
@@ -596,26 +597,14 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
 	     bi = evas_object_data_get(obj, "e_box_data");	
 	     if (bi)
 	       {
-		  if (sd->horizontal)
-		    {
-		       if (minh < bi->min.h) minh = bi->min.h;
-		       if (minw < bi->min.w) minw = bi->min.w;
-		    }
-		  else
-		    {
-		       if (minw < bi->min.w) minw = bi->min.w;
-		       if (minh < bi->min.h) minh = bi->min.h;
-		    }
+                  if (minh < bi->min.h) minh = bi->min.h;
+                  if (minw < bi->min.w) minw = bi->min.w;
 	       }
 	  }
 	if (sd->horizontal)
-	  {
-	     minw *= evas_list_count(sd->items);	     
-	  }
+          minw *= evas_list_count(sd->items);	     
 	else
-	  {
-	     minh *= evas_list_count(sd->items);	     
-	  }
+          minh *= evas_list_count(sd->items);	     
      }
    else
      {
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index 41fea1a..3046171 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -53,6 +53,12 @@ e_canvas_engine_decide(int engine)
    /* if use default - use it */
    if (engine == E_EVAS_ENGINE_DEFAULT)
      engine = e_config->evas_engine_default;
+   /* if engine is software-16 - do we support it? */
+   if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
+     {
+	if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11_16))
+	  engine = E_EVAS_ENGINE_SOFTWARE_X11;
+     }
    /* if engine is gl - do we support it? */
    if (engine == E_EVAS_ENGINE_GL_X11)
      {
@@ -60,6 +66,7 @@ e_canvas_engine_decide(int engine)
 	if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_GL_X11))
 	  engine = E_EVAS_ENGINE_SOFTWARE_X11;
      }
+   /* support xrender? */
    if (engine == E_EVAS_ENGINE_XRENDER_X11)
      {
 	/* if we dont - fall back to software x11 */
@@ -208,6 +215,19 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 	else
 	  goto try2;
      }
+   else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
+     {
+	ee = ecore_evas_software_x11_16_new(NULL, win, x, y, w, h);
+	if (ee)
+	  {
+	     ecore_evas_override_set(ee, override);
+	     if (direct_resize) ecore_evas_software_x11_16_direct_resize_set(ee, 1);
+	     if (win_ret) *win_ret = ecore_evas_software_x11_16_window_get(ee);
+	     if (subwin_ret) *subwin_ret = ecore_evas_software_x11_16_subwindow_get(ee);
+	  }
+	else
+	  goto try2;
+     }
    else
      {
 	try2:
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 3b3e7e6..cc1a060 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1697,14 +1697,14 @@ e_config_save_queue(void)
 							  NULL);
 }
 
-EAPI char *
+EAPI const char *
 e_config_profile_get(void)
 {
    return _e_config_profile;
 }
 
 EAPI void
-e_config_profile_set(char *prof)
+e_config_profile_set(const char *prof)
 {
    E_FREE(_e_config_profile);
    _e_config_profile = strdup(prof);
@@ -1740,7 +1740,7 @@ e_config_profile_list(void)
 }
 
 EAPI void
-e_config_profile_add(char *prof)
+e_config_profile_add(const char *prof)
 {
    char buf[4096];
    const char *homedir;
@@ -1751,7 +1751,7 @@ e_config_profile_add(char *prof)
 }
 
 EAPI void
-e_config_profile_del(char *prof)
+e_config_profile_del(const char *prof)
 {
    Ecore_List *files;
    char buf[4096];
@@ -1792,7 +1792,10 @@ e_config_engine_list(void)
 #if 0
    l = evas_list_append(l, strdup("GL"));
 #endif
-   l = evas_list_append(l, strdup("XRENDER"));
+   if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
+     l = evas_list_append(l, strdup("XRENDER"));
+   if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11_16))
+     l = evas_list_append(l, strdup("SOFTWARE_16"));
    return l;
 }
 
@@ -1809,7 +1812,7 @@ e_config_save_block_get(void)
 }
 
 EAPI void *
-e_config_domain_load(char *domain, E_Config_DD *edd)
+e_config_domain_load(const char *domain, E_Config_DD *edd)
 {
    Eet_File *ef;
    char buf[4096];
@@ -1824,7 +1827,22 @@ e_config_domain_load(char *domain, E_Config_DD *edd)
      {
 	data = eet_data_read(ef, edd, "config");
 	eet_close(ef);
+        return data;
      }
+
+   /* fallback to a system directory
+    * FIXME proper $PATH like handling might be wanted
+    */ 
+   snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg",
+	    e_prefix_data_get(), _e_config_profile, domain);
+   ef = eet_open(buf, EET_FILE_MODE_READ);
+   if (ef)
+     {
+	data = eet_data_read(ef, edd, "config");
+	eet_close(ef);
+        return data;
+     }
+
    return data;
 }
 
@@ -1864,7 +1882,7 @@ e_config_profile_save(void)
 }
 
 EAPI int
-e_config_domain_save(char *domain, E_Config_DD *edd, void *data)
+e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
 {
    Eet_File *ef;
    char buf[4096], buf2[4096];
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index a4ad744..24af5a9 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -36,10 +36,11 @@ typedef struct _E_Event_Config_Icon_Theme   E_Event_Config_Icon_Theme;
 #define E_CONFIG_FILE_GENERATION 0x0124
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
-#define E_EVAS_ENGINE_DEFAULT      0
-#define E_EVAS_ENGINE_SOFTWARE_X11 1
-#define E_EVAS_ENGINE_GL_X11       2
-#define E_EVAS_ENGINE_XRENDER_X11  3
+#define E_EVAS_ENGINE_DEFAULT         0
+#define E_EVAS_ENGINE_SOFTWARE_X11    1
+#define E_EVAS_ENGINE_GL_X11          2
+#define E_EVAS_ENGINE_XRENDER_X11     3
+#define E_EVAS_ENGINE_SOFTWARE_X11_16 4
 
 typedef enum _E_Engine_Context
 {
@@ -426,20 +427,20 @@ EAPI int        e_config_save(void);
 EAPI void       e_config_save_flush(void);
 EAPI void       e_config_save_queue(void);
 
-EAPI char      *e_config_profile_get(void);
-EAPI void       e_config_profile_set(char *prof);
+EAPI const char *e_config_profile_get(void);
+EAPI void       e_config_profile_set(const char *prof);
 EAPI Evas_List *e_config_profile_list(void);
-EAPI void       e_config_profile_add(char *prof);
-EAPI void       e_config_profile_del(char *prof);
+EAPI void       e_config_profile_add(const char *prof);
+EAPI void       e_config_profile_del(const char *prof);
 
 EAPI Evas_List *e_config_engine_list(void);
 
 EAPI void       e_config_save_block_set(int block);
 EAPI int        e_config_save_block_get(void);
     
-EAPI void      *e_config_domain_load(char *domain, E_Config_DD *edd);
+EAPI void      *e_config_domain_load(const char *domain, E_Config_DD *edd);
 EAPI int        e_config_profile_save(void);
-EAPI int        e_config_domain_save(char *domain, E_Config_DD *edd, void *data);
+EAPI int        e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data);
 
 EAPI E_Config_Binding_Mouse  *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in);
 EAPI E_Config_Binding_Key    *e_config_binding_key_match(E_Config_Binding_Key *eb_in);
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 4544c0e..8fe619f 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -177,7 +177,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
    e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del);
    e_dialog_title_set(cfd->dia, cfd->title);
    if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd);
-   
+
    if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
      {
 	if (cfd->view->advanced.create_widgets)
diff --git a/src/bin/e_config_dialog.h b/src/bin/e_config_dialog.h
index 218106b..1ae8298 100644
--- a/src/bin/e_config_dialog.h
+++ b/src/bin/e_config_dialog.h
@@ -6,7 +6,8 @@
 typedef enum _E_Config_Dialog_CFData_Type
 {
    E_CONFIG_DIALOG_CFDATA_TYPE_BASIC,
-   E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED
+   E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED,
+   E_CONFIG_DIALOG_CFDATA_TYPE_NORMAL_WINDOW
 } E_Config_Dialog_CFData_Type;
 
 typedef struct _E_Config_Dialog      E_Config_Dialog;
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index a2e0074..f01b2f7 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -9,8 +9,8 @@ e_configure_init(void)
    e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "enlightenment/modules", e_int_config_modules);
 }
 
-EAPI void
-e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params))
+static void
+_e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params))
 {
    Evas_List *l;
    char *cat;
@@ -30,6 +30,7 @@ e_configure_registry_item_add(const char *path, int pri, const char *label, cons
    if (icon_file) eci->icon_file = evas_stringshare_add(icon_file);
    if (icon) eci->icon = evas_stringshare_add(icon);
    eci->func = func;
+   eci->generic_func = generic_func;
    
    for (l = e_configure_registry; l; l = l->next)
      {
@@ -60,6 +61,18 @@ e_configure_registry_item_add(const char *path, int pri, const char *label, cons
 }
 
 EAPI void
+e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params))
+{
+   _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL);
+}
+
+EAPI void
+e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (E_Container *con, const char *params))
+{
+   _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, NULL, generic_func);
+}
+
+EAPI void
 e_configure_registry_item_del(const char *path)
 {
    Evas_List *l;
@@ -187,6 +200,7 @@ e_configure_registry_call(const char *path, E_Container *con, const char *params
 		  if (!strcmp(item, eci->item))
 		    {
 		       if (eci->func) eci->func(con, params);
+		       else if (eci->generic_func) eci->generic_func(con, params);
 		       goto done;
 		    }
 	       }
diff --git a/src/bin/e_configure.h b/src/bin/e_configure.h
index 8f9132a..a8b8056 100644
--- a/src/bin/e_configure.h
+++ b/src/bin/e_configure.h
@@ -25,9 +25,11 @@ struct _E_Configure_It
    const char        *icon_file;
    const char        *icon;
    E_Config_Dialog *(*func) (E_Container *con, const char *params);
+   void             (*generic_func) (E_Container *con, const char *params);
 };
 
 EAPI void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params));
+EAPI void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (E_Container *con, const char *params));
 EAPI void e_configure_registry_item_del(const char *path);
 EAPI void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon);
 EAPI void e_configure_registry_category_del(const char *path);
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index 169cf77..ff048ba 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -39,7 +39,7 @@ e_container_init(void)
 {
    E_EVENT_CONTAINER_RESIZE = ecore_event_type_new();
    container_count = 0;
-   
+
    handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_container_cb_mouse_in, NULL));
    handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_container_cb_mouse_out, NULL));
    handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_container_cb_mouse_down, NULL));
@@ -71,7 +71,7 @@ e_container_new(E_Manager *man)
    int i;
    Ecore_X_Window mwin;
    static int container_num = 0;
-   
+
    con = E_OBJECT_ALLOC(E_Container, E_CONTAINER_TYPE, _e_container_free);
    if (!con) return NULL;
    con->manager = man;
@@ -86,9 +86,8 @@ e_container_new(E_Manager *man)
 	ecore_x_window_raise(con->win);
      }
    else
-     {
-	con->win = con->manager->win;
-     }
+     con->win = con->manager->win;
+
    con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
 				     0, 0, con->w, con->h, 1, 1,
 				     &(con->bg_win), NULL);
@@ -113,7 +112,7 @@ e_container_new(E_Manager *man)
    evas_object_name_set(o, "e/desktop/background");
    evas_object_data_set(o, "e_container", con);
    evas_object_show(o);
-   
+
    con->num = container_num;
    container_num++;
    snprintf(name, sizeof(name), _("Container %d"), con->num);
@@ -164,23 +163,22 @@ e_container_new(E_Manager *man)
 	for (l = screens; l; l = l->next)
 	  {
 	     E_Screen *scr;
-	     
+
 	     scr = l->data;
 	     zone = e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
 	  }
      }
    else
-     {
-	zone = e_zone_new(con, 0, 0, 0, 0, con->w, con->h);
-     }
+     zone = e_zone_new(con, 0, 0, 0, 0, con->w, con->h);
    return con;
 }
-        
+
 EAPI void
 e_container_show(E_Container *con)
 {
    E_OBJECT_CHECK(con);
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
+
    if (con->visible) return;
    ecore_evas_show(con->bg_ecore_evas);
    ecore_x_window_configure(con->bg_win,
@@ -193,12 +191,13 @@ e_container_show(E_Container *con)
    ecore_x_icccm_state_set(con->bg_win, ECORE_X_WINDOW_STATE_HINT_NORMAL);
    con->visible = 1;
 }
-        
+
 EAPI void
 e_container_hide(E_Container *con)
 {
    E_OBJECT_CHECK(con);
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
+
    if (!con->visible) return;
    ecore_evas_hide(con->bg_ecore_evas);
    if (con->win != con->manager->win)
@@ -215,13 +214,14 @@ e_container_current_get(E_Manager *man)
 
    for (l = man->containers; l; l = l->next)
      {
-	E_Container *con = l->data;
-	if (con->visible)
-	  return con;
+	E_Container *con;
+        
+        if (!(con = l->data)) continue;
+	if (con->visible) return con;
      }
+
    /* If noone is available, return the first */
-   if (!man->containers)
-     return NULL;
+   if (!man->containers) return NULL;
    l = man->containers;
    return (E_Container *)l->data;
 }
@@ -236,10 +236,9 @@ e_container_number_get(E_Manager *man, int num)
    for (l = man->containers; l; l = l->next)
      {
 	E_Container *con;
-	
+
 	con = l->data;
-	if (con->num == num)
-	  return con;
+	if (con->num == num) return con;
      }
    return NULL;
 }
@@ -256,7 +255,7 @@ e_container_move(E_Container *con, int x, int y)
      ecore_x_window_move(con->win, con->x, con->y);
    evas_object_move(con->bg_blank_object, con->x, con->y);
 }
-        
+
 EAPI void
 e_container_resize(E_Container *con, int w, int h)
 {
@@ -307,14 +306,14 @@ e_container_lower(E_Container *con)
 EAPI E_Zone *
 e_container_zone_at_point_get(E_Container *con, int x, int y)
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
    for (l = con->zones; l; l = l->next)
      {
 	E_Zone *zone;
-	
+
 	zone = l->data;
 	if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	  return zone;
@@ -325,17 +324,16 @@ e_container_zone_at_point_get(E_Container *con, int x, int y)
 EAPI E_Zone *
 e_container_zone_number_get(E_Container *con, int num)
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
    for (l = con->zones; l; l = l->next)
      {
 	E_Zone *zone;
-	
+
 	zone = l->data;
-	if (zone->num == num)
-	  return zone;
+	if (zone->num == num) return zone;
      }
    return NULL;
 }
@@ -343,17 +341,16 @@ e_container_zone_number_get(E_Container *con, int num)
 EAPI E_Zone *
 e_container_zone_id_get(E_Container *con, int id)
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
    for (l = con->zones; l; l = l->next)
      {
 	E_Zone *zone;
-	
+
 	zone = l->data;
-	if (zone->id == id)
-	  return zone;
+	if (zone->id == id) return zone;
      }
    return NULL;
 }
@@ -362,10 +359,10 @@ EAPI E_Container_Shape *
 e_container_shape_add(E_Container *con)
 {
    E_Container_Shape *es;
-   
+
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, 0);
-   
+
    es = E_OBJECT_ALLOC(E_Container_Shape, E_CONTAINER_SHAPE_TYPE, _e_container_shape_free);
    E_OBJECT_DEL_SET(es, _e_container_shape_del);
    es->con = con;
@@ -449,7 +446,7 @@ EAPI void
 e_container_shape_change_callback_add(E_Container *con, void (*func) (void *data, E_Container_Shape *es, E_Container_Shape_Change ch), void *data)
 {
    E_Container_Shape_Callback *cb;
-   
+
    E_OBJECT_CHECK(con);
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
    cb = calloc(1, sizeof(E_Container_Shape_Callback));
@@ -462,7 +459,7 @@ e_container_shape_change_callback_add(E_Container *con, void (*func) (void *data
 EAPI void
 e_container_shape_change_callback_del(E_Container *con, void (*func) (void *data, E_Container_Shape *es, E_Container_Shape_Change ch), void *data)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    /* FIXME: if we call this from within a callback we are in trouble */
    E_OBJECT_CHECK(con);
@@ -470,7 +467,7 @@ e_container_shape_change_callback_del(E_Container *con, void (*func) (void *data
    for (l = con->shape_change_cb; l; l = l->next)
      {
 	E_Container_Shape_Callback *cb;
-	
+
 	cb = l->data;
 	if ((cb->func == func) && (cb->data == data))
 	  {
@@ -492,10 +489,10 @@ e_container_shape_rects_get(E_Container_Shape *es)
 EAPI void
 e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int num)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
    int i;
    E_Rect *r;
-   
+
    E_OBJECT_CHECK(es);
    E_OBJECT_TYPE_CHECK(es, E_CONTAINER_SHAPE_TYPE);
    if (es->shape)
@@ -698,7 +695,7 @@ e_container_border_lower(E_Border *bd)
    E_Border *below = NULL;
    Evas_List *l;
    int pos = 0, i;
-   
+
    if (!bd->zone) return NULL;
    /* Remove from old layer */
    for (i = 0; i < 7; i++)
@@ -814,9 +811,9 @@ e_container_border_stack_below(E_Border *bd, E_Border *below)
 EAPI E_Border_List *
 e_container_border_list_first(E_Container *con)
 {
-   E_Border_List *list;
-   list = E_NEW(E_Border_List, 1);
-   if (!list) return NULL;
+   E_Border_List *list = NULL;
+
+   if (!(list = E_NEW(E_Border_List, 1))) return NULL;
    list->container = con;
    e_object_ref(E_OBJECT(con));
    list->layer = 0;
@@ -829,9 +826,9 @@ e_container_border_list_first(E_Container *con)
 EAPI E_Border_List *
 e_container_border_list_last(E_Container *con)
 {
-   E_Border_List *list;
-   list = E_NEW(E_Border_List, 1);
-   if (!list) return NULL;
+   E_Border_List *list = NULL;
+
+   if (!(list = E_NEW(E_Border_List, 1))) return NULL;
    list->container = con;
    e_object_ref(E_OBJECT(con));
    list->layer = 6;
@@ -867,7 +864,7 @@ e_container_border_list_prev(E_Border_List *list)
    E_Border *bd;
 
    if (!list->clients) return NULL;
-   
+
    bd = list->clients->data;
 
    list->clients = list->clients->prev;
@@ -891,18 +888,18 @@ EAPI void
 e_container_all_freeze(void)
 {
    Evas_List *managers, *l;
-   
+
    managers = e_manager_list();
    for (l = managers; l; l = l->next)
      {
 	Evas_List *ll;
 	E_Manager *man;
-	
+
 	man = l->data;
 	for (ll = man->containers; ll; ll = ll->next)
 	  {
 	     E_Container *con;
-	     
+
 	     con = ll->data;
 	     evas_event_freeze(con->bg_evas);
 	  }
@@ -913,18 +910,18 @@ EAPI void
 e_container_all_thaw(void)
 {
    Evas_List *managers, *l;
-   
+
    managers = e_manager_list();
    for (l = managers; l; l = l->next)
      {
 	Evas_List *ll;
 	E_Manager *man;
-	
+
 	man = l->data;
 	for (ll = man->containers; ll; ll = ll->next)
 	  {
 	     E_Container *con;
-	     
+
 	     con = ll->data;
 	     evas_event_thaw(con->bg_evas);
 	  }
@@ -978,18 +975,18 @@ static E_Container *
 _e_container_find_by_event_window(Ecore_X_Window win)
 {
    Evas_List *managers, *l;
-   
+
    managers = e_manager_list();
    for (l = managers; l; l = l->next)
      {
 	Evas_List *ll;
 	E_Manager *man;
-	
+
 	man = l->data;
 	for (ll = man->containers; ll; ll = ll->next)
 	  {
 	     E_Container *con;
-	     
+
 	     con = ll->data;
 	     if (con->event_win == win) return con;
 	  }
@@ -1042,7 +1039,7 @@ _e_container_cb_mouse_in(void *data, int type, void *event)
    Ecore_X_Event_Mouse_In *ev;
    E_Border *bd;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1060,7 +1057,7 @@ _e_container_cb_mouse_out(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1076,7 +1073,7 @@ _e_container_cb_mouse_down(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Button_Down *ev;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1098,7 +1095,7 @@ _e_container_cb_mouse_up(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Button_Up *ev;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1116,7 +1113,7 @@ _e_container_cb_mouse_move(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Move *ev;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1132,7 +1129,7 @@ _e_container_cb_mouse_wheel(void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_Wheel *ev;
    E_Container *con;
-   
+
    ev = event;
    con = _e_container_find_by_event_window(ev->event_win);
    if (con)
@@ -1146,7 +1143,7 @@ _e_container_cb_mouse_wheel(void *data, int type, void *event)
      }
    return 1;
 }
-   
+
 static void
 _e_container_shape_del(E_Container_Shape *es)
 {
@@ -1156,7 +1153,7 @@ _e_container_shape_del(E_Container_Shape *es)
 static void
 _e_container_shape_free(E_Container_Shape *es)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    es->con->shapes = evas_list_remove(es->con->shapes, es);
    for (l = es->shape; l; l = l->next)
@@ -1168,13 +1165,14 @@ _e_container_shape_free(E_Container_Shape *es)
 static void
 _e_container_shape_change_call(E_Container_Shape *es, E_Container_Shape_Change ch)
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
+   if ((!es) || (!es->con) || (!es->con->shape_change_cb)) return;
    for (l = es->con->shape_change_cb; l; l = l->next)
      {
 	E_Container_Shape_Callback *cb;
-	
-	cb = l->data;
+
+	if (!(cb = l->data)) continue;
 	cb->func(cb->data, es, ch);
      }
 }
@@ -1185,14 +1183,14 @@ _e_container_resize_handle(E_Container *con)
    E_Event_Container_Resize *ev;
    Evas_List *l, *screens, *zones = NULL;
    int i;
-   
+
    ev = calloc(1, sizeof(E_Event_Container_Resize));
    ev->container = con;
    e_object_ref(E_OBJECT(con));
-   
+
    e_xinerama_update();
    screens = (Evas_List *)e_xinerama_screens_get();
-   
+
    if (screens)
      {
 	for (l = con->zones; l; l = l->next)
@@ -1201,7 +1199,7 @@ _e_container_resize_handle(E_Container *con)
 	  {
 	     E_Screen *scr;
 	     E_Zone *zone;
-	     
+
 	     scr = l->data;
 	     zone = e_container_zone_id_get(con, scr->escreen);
 	     if (zone)
@@ -1213,13 +1211,13 @@ _e_container_resize_handle(E_Container *con)
 	     else
 	       {
 		  Evas_List *ll;
-		  
+
 		  zone = e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
 		  /* find any shelves configured for this zone and add them in */
 		  for (ll = e_config->shelves; ll; ll = ll->next)
 		    {
 		       E_Config_Shelf *cf_es;
-		       
+
 		       cf_es = ll->data;
 		       if (e_util_container_zone_id_get(cf_es->container, cf_es->zone) == zone)
 			 e_shelf_config_new(zone, cf_es);
@@ -1230,7 +1228,7 @@ _e_container_resize_handle(E_Container *con)
 	  {
 	     E_Zone *spare_zone = NULL;
 	     Evas_List *ll;
-	     
+
 	     for (ll = con->zones; ll; ll = ll->next)
 	       {
 		  spare_zone = ll->data;
@@ -1244,7 +1242,7 @@ _e_container_resize_handle(E_Container *con)
 		  Evas_List *shelves, *ll, *del_shelves;
 		  E_Border_List *bl;
 		  E_Border *bd;
-		  
+
 		  zone = zones->data;
 		  /* delete any shelves on this zone */
 		  shelves = e_shelf_list();
@@ -1252,7 +1250,7 @@ _e_container_resize_handle(E_Container *con)
 		  for (ll = shelves; ll; ll = ll->next)
 		    {
 		       E_Shelf *es;
-		       
+
 		       es = ll->data;
 		       if (es->zone == zone)
 			 del_shelves = evas_list_append(del_shelves, es);
@@ -1283,14 +1281,14 @@ _e_container_resize_handle(E_Container *con)
    else
      {
 	E_Zone *zone;
-	
+
 	zone = e_container_zone_number_get(con, 0);
 	e_zone_move_resize(zone, 0, 0, con->w, con->h);
 	e_shelf_zone_move_resize_handle(zone);	
      }
-   
+
    ecore_event_add(E_EVENT_CONTAINER_RESIZE, ev, _e_container_event_container_resize_free, NULL);
-   
+
    for (i = 0; i < 7; i++)
      {
 	Evas_List *tmp = NULL;
@@ -1317,7 +1315,7 @@ static void
 _e_container_event_container_resize_free(void *data, void *ev)
 {
    E_Event_Container_Resize *e;
-   
+
    e = ev;
    e_object_unref(E_OBJECT(e->container));
    free(e);
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index b72442a..6007e76 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -613,16 +613,20 @@ _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win)
 static void
 _e_drag_win_show(E_Drop_Handler *h)
 {
+   E_Shelf *shelf;
+
    if (h->obj)
      {
 	switch (h->obj->type)
 	  {
 	   case E_GADCON_TYPE:
-	      e_shelf_toggle(e_gadcon_shelf_get((E_Gadcon *)(h->obj)), 1);
-	      break;
+	     shelf = e_gadcon_shelf_get((E_Gadcon *)(h->obj));
+	     if (shelf) e_shelf_toggle(shelf, 1);
+	     break;
 	   case E_GADCON_CLIENT_TYPE:
-	      e_shelf_toggle(e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon), 1);
-	      break;
+	     shelf = e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon);
+	     if (shelf) e_shelf_toggle(shelf, 1);
+	     break;
 	     /* FIXME: add more types as needed */
 	   default:
 	     break;
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 590d6b3..c5f3909 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -582,7 +582,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
      }
    else
      {
-	o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
+	o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
 			      _e_desktop_edit_select_cb, cfdata,
 			      NULL, cfdata, 1);
      }
@@ -646,7 +646,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
      }
    else
      {
-	o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
+	o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
 			      _e_desktop_edit_select_cb, cfdata,
 			      NULL, cfdata, 1);
      }
diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c
index d1dd80c..f19d068 100644
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@@ -1357,14 +1357,32 @@ _e_entry_cb_imf_event_commit(void *data, int type, void *event)
    Evas_Object *entry;
    E_Entry_Smart_Data *sd;
    Ecore_IMF_Event_Commit *ev = event;
+   Evas_Object *editable;
+   int cursor_pos, selection_pos;
+   int start_pos, end_pos;
+   int selecting;
+   int changed = 0;
 
    if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
      return 1;
 
    if (sd->imf_context != ev->ctx)
-      return 1;
+     return 1;
+
+   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);
+   changed |= e_editable_insert(editable, start_pos, ev->str);
+
+   if (changed)
+     evas_object_smart_callback_call(entry, "changed", NULL);
 
-   e_entry_text_set(entry, ev->str);
    return 0;
 }
 
@@ -1379,7 +1397,7 @@ _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
    sd = data;
 
    if (sd->imf_context != ev->ctx)
-      return 1;
+     return 1;
 
    editable = sd->editable_object;
    cursor_pos = e_editable_cursor_pos_get(editable);
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index c83ee4e..4d98070 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -13,7 +13,6 @@
  */
 
 typedef struct _E_Exec_Launch   E_Exec_Launch;
-typedef struct _E_Exec_Instance E_Exec_Instance;
 typedef struct _E_Exec_Search   E_Exec_Search;
 
 struct _E_Exec_Launch
@@ -22,15 +21,6 @@ struct _E_Exec_Launch
    const char     *launch_method;
 };
 
-struct _E_Exec_Instance
-{
-   Efreet_Desktop *desktop;
-   Ecore_Exe      *exe;
-   int             startup_id;
-   double          launch_time;
-   Ecore_Timer    *expire_timer;
-};
-
 struct _E_Exec_Search
 {
    Efreet_Desktop *desktop;
@@ -53,11 +43,11 @@ struct _E_Config_Dialog_Data
 };
 
 /* local subsystem functions */
-static void _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining);
+static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining);
 static int  _e_exec_cb_expire_timer(void *data);
 static int  _e_exec_cb_exit(void *data, int type, void *event);
 
-static Evas_Bool _e_exec_startup_id_pid_find(Evas_Hash *hash, const char *key, void *value, void *data);
+static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data);
 
 static void         _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read);
 static void         _fill_data(E_Config_Dialog_Data *cfdata);
@@ -104,15 +94,16 @@ e_exec_shutdown(void)
    return 1;
 }
 
-EAPI int
+EAPI E_Exec_Instance *
 e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
        Ecore_List *files, const char *launch_method)
 {
    E_Exec_Launch *launch;
+   E_Exec_Instance *inst = NULL;
 
-   if ((!desktop) && (!exec)) return 0;
+   if ((!desktop) && (!exec)) return NULL;
    launch = E_NEW(E_Exec_Launch, 1);
-   if (!launch) return 0;
+   if (!launch) return NULL;
    if (zone)
      {
 	launch->zone = zone;
@@ -124,13 +115,13 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
    if (desktop)
      {
 	if (exec)
-	  _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
+	  inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
 	else
-	  efreet_desktop_command_get(desktop, files, _e_exec_cb_exec, launch);
+	  inst = efreet_desktop_command_get(desktop, files, _e_exec_cb_exec, launch);
      }
    else
-     _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
-   return 1;
+     inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
+   return inst;
 }
 
 EAPI Efreet_Desktop *
@@ -146,7 +137,7 @@ e_exec_startup_id_pid_find(int startup_id, pid_t pid)
 }
 
 /* local subsystem functions */
-static void
+static E_Exec_Instance *
 _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 {
    E_Exec_Instance *inst = NULL;
@@ -159,7 +150,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
    if (desktop)
      {
 	inst = E_NEW(E_Exec_Instance, 1);
-	if (!inst) return;
+	if (!inst) return NULL;
      }
 
    if (startup_id == 0)
@@ -229,7 +220,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 			     "<br>"
 			     "%s<br>"),
 			   exec);
-	return;
+	return NULL;
      }
    /* reset env vars */
    if (launch->launch_method) e_exehist_add(launch->launch_method, exec);
@@ -264,15 +255,20 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 	  }
 	e_exec_start_pending = evas_list_append(e_exec_start_pending, desktop);
      }
-   else if (exe) 
-     ecore_exe_free(exe);
+   else if (exe)
+     {
+	E_FREE(inst);
+	inst = NULL;
+	ecore_exe_free(exe);
+     }
    
    if (!remaining)
      {
 	if (launch->launch_method) evas_stringshare_del(launch->launch_method);
 	if (launch->zone) e_object_unref(E_OBJECT(launch->zone));
-       	free(launch);
+      	free(launch);
      }
+   return inst;
 }
 
 static int
@@ -294,12 +290,17 @@ _e_exec_cb_exit(void *data, int type, void *event)
    E_Exec_Instance *inst;
 
    ev = event;
+   printf("child exit...\n");
    if (!ev->exe) return 1;
+   if (ecore_exe_tag_get(ev->exe)) printf("  tag %s\n", ecore_exe_tag_get(ev->exe));
    if (!(ecore_exe_tag_get(ev->exe) && 
 	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
    inst = ecore_exe_data_get(ev->exe);
+   printf("  inst = %p\n", inst);
    if (!inst) return 1;
 
+   printf("  inst exec line -- '%s'\n", ecore_exe_cmd_get(inst->exe));
+   
    /* /bin/sh uses this if cmd not found */
    if ((ev->exited) &&
        ((ev->exit_code == 127) || (ev->exit_code == 255)))
@@ -335,14 +336,17 @@ _e_exec_cb_exit(void *data, int type, void *event)
 			     ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_ERROR),
 			     ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
      }
-   instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path);
-   if (instances)
+   if (inst->desktop)
      {
-	instances = evas_list_remove(instances, inst);
+	instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path);
 	if (instances)
-	  evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
-	else
-	  e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
+	  {
+	     instances = evas_list_remove(instances, inst);
+	     if (instances)
+	       evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
+	     else
+	       e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
+	  }
      }
    e_exec_start_pending = evas_list_remove(e_exec_start_pending, inst->desktop);
    if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
@@ -352,10 +356,10 @@ _e_exec_cb_exit(void *data, int type, void *event)
 }
 
 static Evas_Bool
-_e_exec_startup_id_pid_find(Evas_Hash *hash, const char *key, void *value, void *data)
+_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data)
 {
    E_Exec_Search *search;
-   Evas_List     *instances, *l;
+   Evas_List *instances, *l;
 
    search = data;
    instances = value;
@@ -365,7 +369,8 @@ _e_exec_startup_id_pid_find(Evas_Hash *hash, const char *key, void *value, void
 
 	inst = l->data;
 	if (((search->startup_id > 0) && (search->startup_id == inst->startup_id)) ||
-	    ((inst->exe) && (search->pid > 1) && (search->pid == ecore_exe_pid_get(inst->exe))))
+	    ((inst->exe) && (search->pid > 1) && 
+             (search->pid == ecore_exe_pid_get(inst->exe))))
 	  {
 	     search->desktop = inst->desktop;
 	     return 0;
diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h
index 054effa..38eec0d 100644
--- a/src/bin/e_exec.h
+++ b/src/bin/e_exec.h
@@ -3,13 +3,24 @@
  */
 #ifdef E_TYPEDEFS
 
+typedef struct _E_Exec_Instance E_Exec_Instance;
+
 #else
 #ifndef E_EXEC_H
 #define E_EXEC_H
 
+struct _E_Exec_Instance
+{
+   Efreet_Desktop *desktop;
+   Ecore_Exe      *exe;
+   int             startup_id;
+   double          launch_time;
+   Ecore_Timer    *expire_timer;
+};
+
 EAPI int  e_exec_init(void);
 EAPI int  e_exec_shutdown(void);
-EAPI int  e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Ecore_List *files, const char *launch_method);
+EAPI E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Ecore_List *files, const char *launch_method);
 
 EAPI Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid);
 
diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c
index 101ce73..265d400 100644
--- a/src/bin/e_filereg.c
+++ b/src/bin/e_filereg.c
@@ -17,7 +17,7 @@ struct _Filereg_Item
    int ref_count;
 };
 
-static Evas_Bool _filereg_hash_cb_free(Evas_Hash *hash __UNUSED__, 
+static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, 
 				       const char *key __UNUSED__, 
 				       void *data, void *fdata __UNUSED__);
 
@@ -86,7 +86,7 @@ e_filereg_file_protected(const char *path)
 
 /* Private Functions */
 static Evas_Bool 
-_filereg_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		      void *data, void *fdata __UNUSED__) 
 {
    Filereg_Item *fi;
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 73264d3..052477f 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -453,7 +453,7 @@ EAPI void
 e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
 {
    E_Fm2_Smart_Data *sd;
-   const char *realpath, *extended_path;
+   const char *realpath;
 
    sd = evas_object_smart_data_get(obj);
    if (!sd || !path) return; // safety
@@ -491,12 +491,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
 	sd->config->theme.fixed = 0;
      }
    
-   if (!strcmp(path, "~/")) 
-     extended_path = e_user_homedir_get();
-   else 
-     extended_path = path;
-
-   realpath = _e_fm2_dev_path_map(dev, extended_path);
+   realpath = _e_fm2_dev_path_map(dev, path);
    /* If the path doesn't exist, popup a dialog */
    if (dev && strncmp(dev, "removable:", 10)
        && !ecore_file_exists(realpath))
@@ -514,10 +509,10 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
 	dialog = e_dialog_new(con, "E", "_fm_file_unexisting_path_dialog");
 	e_dialog_button_add(dialog, _("Close"), NULL, NULL, dialog);
 	e_dialog_button_focus_num(dialog, 0);
-	e_dialog_title_set(dialog, _("Unexisting path"));
+	e_dialog_title_set(dialog, _("Nonexistent path"));
 
 	snprintf(text, sizeof(text), 
-		 _("%s doesn't exists"),
+		 _("%s doesn't exist."),
 		 realpath);
 
 	e_dialog_text_set(dialog, text);
@@ -537,7 +532,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
    sd->order_file = 0;
    
    if (dev) sd->dev = evas_stringshare_add(dev);
-   if (path) sd->path = evas_stringshare_add(extended_path);
+   if (path) sd->path = evas_stringshare_add(path);
    sd->realpath = realpath;
    _e_fm2_queue_free(obj);
    _e_fm2_regions_free(obj);
@@ -2267,7 +2262,6 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
    int len;
    
    /* map a device name to a mount point/path on the os (and append path) */
-   if (!dev) return evas_stringshare_add(path);
 
    /* FIXME: load mappings from config and use them first - maybe device
     * discovery should be done through config and not the below (except
@@ -2286,7 +2280,7 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
 	s = (char *)e_user_homedir_get();
 	PRT("%s%s", s, path);
      }
-   else if (dev[0] == '/') 
+   else if ((dev) && (dev[0] == '/'))
      {
 	/* dev is a full path - consider it a mountpoint device on its own */
 	PRT("%s%s", dev, path);
@@ -2350,6 +2344,8 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
    /* FIXME: add code for finding nfs shares, smb shares etc. */
    /* maybe make part of the device mappings config? */
 
+   if (!strlen(buf)) snprintf(buf, sizeof(buf), "%s", path);
+
    /* strip out excess multiple slashes */
    s = buf;
    while (*s)
@@ -3381,6 +3377,7 @@ _e_fm2_icon_unfill(E_Fm2_Icon *ic)
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
    if (ic->info.real_link) evas_stringshare_del(ic->info.real_link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    ic->info.mime = NULL;
    ic->info.label = NULL;
    ic->info.comment = NULL;
@@ -3653,6 +3650,7 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
    if (ic->info.real_link) evas_stringshare_del(ic->info.real_link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    free(ic);
 }
 
@@ -3929,6 +3927,8 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
 	       }
 	  }
      }
+   /* FIXME: get category */
+   ic->info.category = NULL;
    efreet_desktop_free(desktop);
 
    return 1;
@@ -3938,11 +3938,13 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
    if (ic->info.generic) evas_stringshare_del(ic->info.generic);
    if (ic->info.icon) evas_stringshare_del(ic->info.icon);
    if (ic->info.link) evas_stringshare_del(ic->info.link);
+   if (ic->info.category) evas_stringshare_del(ic->info.category);
    ic->info.label = NULL;
    ic->info.comment = NULL;
    ic->info.generic = NULL;
    ic->info.icon = NULL;
    ic->info.link = NULL;
+   ic->info.category = NULL;
    //Hack
    if (!strncmp(ic->info.file, "|storage_", 9)) ecore_file_unlink(buf);
    return 0;
@@ -5011,7 +5013,7 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers)
        (ic->sd->config->view.single_click)
        )
      {
-	if (!up)
+	if (up)
 	  evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
      }
 }
@@ -5145,8 +5147,8 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
    E_Fm2_Icon_Info *ici;
    
    ic = data;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if ((ic->drag.start) && (ic->sd->eobj))
      {     
 	int dx, dy;
@@ -5811,10 +5813,17 @@ _e_fm2_cb_icon_sort(void *data1, void *data2)
      {
 	char buf1[4096], buf2[4096], *p;
 	
-	strncpy(buf1, l1, sizeof(buf1) - 2);
-	strncpy(buf2, l2, sizeof(buf2) - 2);
-	buf1[sizeof(buf1) - 1] = 0;
-	buf2[sizeof(buf2) - 1] = 0;
+/*	if (ic1->sd->config->list.sort.category)
+	  {
+ * FIXME: implement category sorting
+	  }
+	else
+*/	  {
+	     strncpy(buf1, l1, sizeof(buf1) - 2);
+	     strncpy(buf2, l2, sizeof(buf2) - 2);
+	     buf1[sizeof(buf1) - 1] = 0;
+	     buf2[sizeof(buf2) - 1] = 0;
+	  }
 	p = buf1;
 	while (*p)
 	  {
@@ -5982,6 +5991,7 @@ _e_fm2_smart_del(Evas_Object *obj)
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
 
+   _e_fm2_client_monitor_list_end(obj);
    if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath);
    _e_fm2_live_process_end(obj);
    _e_fm2_queue_free(obj);
diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h
index b499bb5..b03fecb 100644
--- a/src/bin/e_fm.h
+++ b/src/bin/e_fm.h
@@ -106,6 +106,7 @@ struct _E_Fm2_Icon_Info
    const char       *icon;
    const char       *link;
    const char       *real_link;
+   const char       *category;
    struct stat       statinfo;
    unsigned char     icon_type;
    unsigned char     mount : 1;
diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c
index 27f6f06..853c455 100644
--- a/src/bin/e_fm_custom.c
+++ b/src/bin/e_fm_custom.c
@@ -3,12 +3,12 @@
  */
 #include "e.h"
 
-static Evas_Bool _e_fm2_custom_file_hash_foreach_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 static Evas_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str);
 //static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
 //static Evas_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str);
-static Evas_Bool _e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool _e_fm2_custom_file_hash_foreach_save(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 static void _e_fm2_custom_file_info_load(void);
 static void _e_fm2_custom_file_info_save(void);
 static void _e_fm2_custom_file_info_free(void);
@@ -220,7 +220,7 @@ struct _E_Custom_List
 };
 
 static Evas_Bool
-_e_fm2_custom_file_hash_foreach_list(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    struct _E_Custom_List *cl;
    
@@ -245,7 +245,7 @@ _e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str)
 
 /*
 static Evas_Bool
-_e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    struct _E_Custom_List *cl;
    
@@ -258,7 +258,7 @@ _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void
 
 /*
 static Evas_List *
-_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str)
+_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str)
 {
    struct _E_Custom_List cl;
    
@@ -271,7 +271,7 @@ _e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str)
 */
 
 static Evas_Bool
-_e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    E_Fm2_Custom_File *cf;
    
@@ -283,7 +283,7 @@ _e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, vo
 }
 
 static Evas_Bool
-_e_fm2_custom_file_hash_foreach_save(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    Eet_File *ef;
    E_Fm2_Custom_File *cf;
diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c
index bb9455b..031de46 100644
--- a/src/bin/e_fm_hal.c
+++ b/src/bin/e_fm_hal.c
@@ -127,8 +127,31 @@ e_fm2_hal_volume_add(E_Volume *v)
 	  v->mount_point, 
 	  v->parent);
 
-   if (!v->mount_point)
-     v->mount_point = e_fm2_hal_volume_mountpoint_get(v);
+   if ((!v->mount_point) || (v->mount_point[0] == 0))
+     {
+	if (v->mount_point) free(v->mount_point);
+	v->mount_point = NULL;
+	v->mount_point = e_fm2_hal_volume_mountpoint_get(v);
+	if ((!v->mount_point) || (v->mount_point[0] == 0))
+	  {
+	     char buf[PATH_MAX];
+	     char *id;
+	     
+	     if (v->mount_point) free(v->mount_point);
+	     v->mount_point = NULL;
+	     id = "disk";
+	     if ((v->uuid) && (v->uuid[0])) id = v->uuid;
+	     if (ecore_file_is_dir("/media"))
+	       snprintf(buf, sizeof(buf), "/media/%s", id);
+	     else if (ecore_file_is_dir("/mnt"))
+	       snprintf(buf, sizeof(buf), "/mnt/%s", id);
+	     else if (ecore_file_is_dir("/tmp"))
+	       snprintf(buf, sizeof(buf), "/tmp/%s", id);
+	     else
+	       buf[0] = 0;
+	     v->mount_point = strdup(buf);
+	  }
+     }
 
    if ((s = e_fm2_hal_storage_find(v->parent)))
      {
@@ -136,11 +159,11 @@ e_fm2_hal_volume_add(E_Volume *v)
 	s->volumes = evas_list_append(s->volumes, v);
      }
 
-   if ((v->storage)
-       && (!v->mount_point 
-	   || (strcmp(v->mount_point, "/") 
-	       && strcmp(v->mount_point, "/home") 
-	       && strcmp(v->mount_point, "/tmp"))))
+   if ((v->storage) &&
+       ((!v->mount_point) ||
+       	(strcmp(v->mount_point, "/") &&
+	 strcmp(v->mount_point, "/home") &&
+	 strcmp(v->mount_point, "/tmp"))))
      {
 	_e_fm2_volume_write(v);
      }
@@ -198,25 +221,26 @@ _e_fm2_volume_write(E_Volume *v)
 	  }
 
 	/* Choose the label */
-	if (v->label)
+	if ((v->label) && (v->label[0]))
 	  snprintf(label, sizeof(label), "%s", v->label);
-	else if (v->partition_label)
+	else if ((v->partition_label) && (v->partition_label[0]))
 	  snprintf(label, sizeof(label) - 1, "%s", v->partition_label);
-	else if (v->storage->vendor && v->storage->model)
+	else if (((v->storage->vendor) && (v->storage->vendor[0])) && 
+		 ((v->storage->model) && (v->storage->model[0])))
 	  {
 	     if (size[0] != '\0')
 	       snprintf(label, sizeof(label) - 1, "%s %s - %s", v->storage->vendor, v->storage->model, size);
 	     else
 	       snprintf(label, sizeof(label) - 1, "%s %s", v->storage->vendor, v->storage->model);
 	  }
-	else if (v->storage->model)
+	else if ((v->storage->model) && (v->storage->model[0]))
 	  {
 	     if (size[0] != '\0')
 	       snprintf(label, sizeof(label) - 1, "%s - %s", v->storage->model, size);
 	     else
 	       snprintf(label, sizeof(label) - 1, "%s", v->storage->model);
 	  }
-	else if (v->storage->vendor)
+	else if ((v->storage->vendor) && (v->storage->vendor[0]))
 	  {
 	     if (size[0] != '\0')
 	       snprintf(label, sizeof(label) - 1, "%s - %s", v->storage->vendor, size);
@@ -416,7 +440,7 @@ e_fm2_hal_mount(E_Volume *v,
 
    v->mounts = evas_list_prepend(v->mounts, m);
 
-   printf("BEGIN MOUNT %p %s\n", m, v->mount_point);
+   printf("BEGIN MOUNT %p '%s'\n", m, v->mount_point);
    
    if (!v->mounted)
      {
@@ -453,7 +477,7 @@ _e_fm2_hal_mount_ok(E_Fm2_Mount *m)
 	m->timeout = NULL;
      }
    if (m->mount_ok) m->mount_ok(m->data);
-   printf("MOUNT OK %s\n", m->mount_point);
+   printf("MOUNT OK '%s'\n", m->mount_point);
 }
 
 static int
diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c
index 72f0746..46e0bcd 100644
--- a/src/bin/e_fm_mime.c
+++ b/src/bin/e_fm_mime.c
@@ -12,8 +12,8 @@ struct _E_Fm2_Mime_Handler_Tuple
 };
 
 /* local subsystem functions */
-static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata);
-static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
+static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata);
+static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
 
 static Evas_Hash *icon_map = NULL;
 static Evas_Hash *_mime_handlers = NULL;
@@ -356,7 +356,7 @@ e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
 /* local subsystem functions */
 /* used to loop a glob hash and determine if the glob handler matches the filename */
 static Evas_Bool 
-_e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
+_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
 {
    E_Fm2_Mime_Handler_Tuple *tuple;
    Evas_List *handlers = NULL;
@@ -377,7 +377,7 @@ _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *k
 }
 
 static Evas_Bool
-_e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
+_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
 {
    Evas_List **freelist;
    
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index 6663df7..7900ada 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -5,7 +5,7 @@
 
 #define E_TOK_STYLE ":style="
 
-static Evas_Bool _font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__);
 static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name);
 static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font);
 static char _fn_buf[1024];
@@ -151,12 +151,12 @@ e_font_properties_free(E_Font_Properties *efp)
 }
 
 static Evas_Bool
-_font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    E_Font_Properties *efp;
+
    efp = data;
    e_font_properties_free(efp);
-
    return 1;
 }
 
@@ -177,74 +177,67 @@ e_font_fontconfig_name_parse(const char *font)
 static E_Font_Properties *
 _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font)
 {
-        char *s1;
+   char *s1;
+
+   s1 = strchr(font, ':');
+   if (s1)
+     {
+        char *s2, *name, *style;
+        int len;
 
-        s1 = strchr(font, ':');
-        if (s1)
+        len = s1 - font;
+        name = calloc(sizeof(char), len + 1);
+        strncpy(name, font, len);
+
+        /* Get subname (should be english)  */
+        s2 = strchr(name, ',');
+        if (s2)
           {
-             char *s2;
-             char *name;
-             char *style;
-             int len;
-	     
-	     len = s1 - font;
-
-             name = calloc(sizeof(char), len + 1);
+             len = s2 - name;
+             name = realloc(name, sizeof(char) * len + 1);
+             memset(name, 0, sizeof(char) * len + 1);
              strncpy(name, font, len);
+          }
 
-	     /* Get subname (should be english)  */
-             s2 = strchr(name, ',');
-             if (s2)
-               {
-                  len = s2 - name;
+        if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
+          {
+             style = s1 + strlen(E_TOK_STYLE);
 
-                  name = realloc(name, sizeof(char) * len + 1);
-                  memset(name, 0, sizeof(char) * len + 1);
-                  strncpy(name, font, len);
+             if (font_hash) efp = evas_hash_find(*font_hash, name);
+             if (efp == NULL)
+               {
+                  efp = calloc(1, sizeof(E_Font_Properties));
+                  efp->name = evas_stringshare_add(name);
+                  if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
                }
-
-             if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
+             s2 = strchr(style, ',');
+             if (s2)
                {
-                  style = s1 + strlen(E_TOK_STYLE);
-
-		  if (font_hash) efp = evas_hash_find(*font_hash, name);
-                  if (efp == NULL)
-                    {
-                       efp = calloc(1, sizeof(E_Font_Properties));
-                       efp->name = evas_stringshare_add(name);
-                       if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
-                    }
-		  s2 = strchr(style, ',');
-		  if (s2)
-		    {
-		       char *style_old;
-		       len = s2 - style;
-
-		       style_old = style;
-		       style = calloc(sizeof(char), len + 1);
-		       strncpy(style, style_old, len);
-		       efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
-		       free(style);
-		    }
-		  else
-		    {
-		       efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
-		    }
+                  char *style_old;
+
+                  len = s2 - style;
+                  style_old = style;
+                  style = calloc(sizeof(char), len + 1);
+                  strncpy(style, style_old, len);
+                  efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
+                  free(style);
                }
-
-             free(name);
+             else
+               efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
           }
-	else 
-	  {
-	     if (font_hash) efp = evas_hash_find(*font_hash, font);
-	     if (efp == NULL)
-	       {
-		  efp = calloc(1, sizeof(E_Font_Properties));
-		  efp->name = evas_stringshare_add(font);
-		  if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
-	       }
-	  }
-        return efp;
+        free(name);
+     }
+   else 
+     {
+        if (font_hash) efp = evas_hash_find(*font_hash, font);
+        if (efp == NULL)
+          {
+             efp = calloc(1, sizeof(E_Font_Properties));
+             efp->name = evas_stringshare_add(font);
+             if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
+          }
+     }
+   return efp;
 }
 
 
@@ -252,7 +245,6 @@ static Evas_Hash *
 _e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name)
 {
    _e_font_fontconfig_name_parse(&font_hash, NULL, full_name);
-
    return font_hash;
 }
 
@@ -281,9 +273,7 @@ e_font_available_list_parse(Evas_List *list)
    font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Bold Oblique");
 
    for (next = list; next; next = next->next)
-     {
-        font_hash = _e_font_available_hash_add(font_hash, next->data);
-     }
+     font_hash = _e_font_available_hash_add(font_hash, next->data);
 
    return font_hash;
 }
@@ -293,12 +283,11 @@ EAPI const char *
 e_font_fontconfig_name_get(const char *name, const char *style)
 {
    char buf[256];
+
    if (name == NULL) return NULL;
    if (style == NULL || style[0] == 0) return evas_stringshare_add(name);
-
    snprintf(buf, 256, "%s"E_TOK_STYLE"%s", name, style);
    return evas_stringshare_add(buf);
-
 }
 
 EAPI void
@@ -309,9 +298,8 @@ e_font_fallback_clear(void)
    while (e_config->font_fallbacks)
      {	
 	eff = e_config->font_fallbacks->data;
-	e_config->font_fallbacks = evas_list_remove_list(
-					e_config->font_fallbacks,
-					e_config->font_fallbacks);
+	e_config->font_fallbacks = 
+          evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
 	if (eff->name) evas_stringshare_del(eff->name);
 	E_FREE(eff);
     }
@@ -322,7 +310,7 @@ e_font_fallback_append(const char *font)
 {
    E_Font_Fallback *eff;
 
-   e_font_fallback_remove (font);
+   e_font_fallback_remove(font);
 
    eff = E_NEW(E_Font_Fallback, 1);
    eff->name = evas_stringshare_add(font);
@@ -334,7 +322,7 @@ e_font_fallback_prepend(const char *font)
 {
    E_Font_Fallback *eff;
 
-   e_font_fallback_remove (font);
+   e_font_fallback_remove(font);
 
    eff = E_NEW(E_Font_Fallback, 1);
    eff->name = evas_stringshare_add(font);
@@ -353,8 +341,8 @@ e_font_fallback_remove(const char *font)
 	eff = evas_list_data(next);
 	if (!strcmp(eff->name, font))
 	  {
-	     e_config->font_fallbacks = evas_list_remove_list(
-					e_config->font_fallbacks, next);
+	     e_config->font_fallbacks = 
+               evas_list_remove_list(e_config->font_fallbacks, next);
 	     if (eff->name) evas_stringshare_del(eff->name);
 	     E_FREE(eff);
 	     break;
@@ -384,10 +372,10 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
 	     efd->font = evas_stringshare_add(font);
 	     efd->size = size;
 	     /* move to the front of the list */
-	     e_config->font_defaults = evas_list_remove_list(
-					e_config->font_defaults, next);
-	     e_config->font_defaults = evas_list_prepend(
-					e_config->font_defaults, efd);
+	     e_config->font_defaults = 
+               evas_list_remove_list(e_config->font_defaults, next);
+	     e_config->font_defaults = 
+               evas_list_prepend(e_config->font_defaults, efd);
 	     return;
 	  }
      }
@@ -417,17 +405,15 @@ e_font_default_get(const char *text_class)
 	if (!strcmp(efd->text_class, text_class))
 	  {
 	     /* move to the front of the list */
-	     e_config->font_defaults = evas_list_remove_list(
-					e_config->font_defaults, next);
-	     e_config->font_defaults = evas_list_prepend(
-					e_config->font_defaults, efd);
+	     e_config->font_defaults = 
+               evas_list_remove_list(e_config->font_defaults, next);
+	     e_config->font_defaults = 
+               evas_list_prepend(e_config->font_defaults, efd);
 	     return efd;
 	  }
-	if (!strcmp(efd->text_class, "default"))
-	  defd = efd;
+	if (!strcmp(efd->text_class, "default")) defd = efd;
      }
-   if (!defd)
-     defd  = efd;
+   if (!defd) defd  = efd;
    return defd;
 }
 
@@ -443,8 +429,8 @@ e_font_default_remove(const char *text_class)
 	efd = evas_list_data(next);
 	if (!strcmp(efd->text_class, text_class))
 	  {
-	     e_config->font_defaults = evas_list_remove_list(
-					e_config->font_defaults, next);
+	     e_config->font_defaults = 
+               evas_list_remove_list(e_config->font_defaults, next);
 	     if (efd->text_class) evas_stringshare_del(efd->text_class);
 	     if (efd->font) evas_stringshare_del(efd->font);
 	     E_FREE(efd);
@@ -510,4 +496,3 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
    if (size_ret) *size_ret = efd->size;
    return _fn_buf;
 }
-
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 8289d26..15f513d 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -29,6 +29,10 @@ static void _e_gadcon_cb_client_mouse_out(void *data, Evas *evas, Evas_Object *o
 static void _e_gadcon_cb_client_move(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_gadcon_cb_client_resize(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 
+static void _e_gadcon_client_move_start(E_Gadcon_Client *gcc);
+static void _e_gadcon_client_move_stop(E_Gadcon_Client *gcc);
+static void _e_gadcon_client_move_go(E_Gadcon_Client *gcc);
+
 static void _e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -47,6 +51,8 @@ static void _e_gadcon_cb_drop(void *data, const char *type, void *event);
 static int _e_gadcon_client_class_feature_check(E_Gadcon_Client_Class *cc, const char *name, void *feature);
 static void _e_gadcon_client_cb_menu_post(void *data, E_Menu *m);
 static void _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_gadcon_client_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_gadcon_client_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 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);
@@ -54,6 +60,8 @@ static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Ite
 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_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info);
+
 static Evas_Object *e_gadcon_layout_add(Evas *evas);
 static void e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal);
 static int e_gadcon_layout_orientation_get(Evas_Object *obj);
@@ -402,9 +410,9 @@ e_gadcon_populate(E_Gadcon *gc)
 		  gcc->state_info.flags = cf_gcc->state_info.flags;
 		  if (gcc->o_frame)
 		    e_gadcon_layout_pack_options_set(gcc->o_frame, gcc);
-		  else
+		  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->client_class->func.orient)
@@ -412,6 +420,8 @@ e_gadcon_populate(E_Gadcon *gc)
 
 		  _e_gadcon_client_save(gcc);
 		  if (gc->editing) e_gadcon_client_edit_begin(gcc);
+		  if (gc->instant_edit)
+		    e_gadcon_client_util_menu_attach(gcc);
 	       }
 	  }
      }
@@ -471,7 +481,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 		  gcc->state_info.flags = cf_gcc->state_info.flags;
 		  if (gcc->o_frame)
 		    e_gadcon_layout_pack_options_set(gcc->o_frame, gcc);
-		  else
+		  else if (gcc->o_base)
 		    e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
 
 		  if (gcc->client_class->func.orient)
@@ -479,6 +489,8 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 
 		  _e_gadcon_client_save(gcc);
 		  if (gc->editing) e_gadcon_client_edit_begin(gcc);
+		  if (gc->instant_edit)
+		    e_gadcon_client_util_menu_attach(gcc);
 	       }
 	  }
      }
@@ -752,9 +764,13 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
    gcc->name = evas_stringshare_add(name);
    gcc->gadcon = gc;
    gcc->o_base = base_obj;
+   if (gc->clients)
+     gcc->id = E_GADCON_CLIENT(evas_list_data(evas_list_last(gc->clients)))->id + 1;
    gc->clients = evas_list_append(gc->clients, gcc);
    /* This must only be unique during runtime */
-   gcc->id = E_GADCON_CLIENT(evas_list_last(gc->clients))->id + 1;
+   if (gcc->o_base)
+     evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_DEL,
+				    _e_gadcon_client_del_hook, gcc);
    if ((gc->frame_request.func) && (style))
      {
 	gcc->o_frame = gc->frame_request.func(gc->frame_request.data, gcc, style);
@@ -793,14 +809,17 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
 					    _e_gadcon_cb_client_frame_moveresize, gcc);
 	     evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_MOVE,
 					    _e_gadcon_cb_client_frame_mouse_move, gcc);
-	     e_box_pack_end(gcc->o_box, gcc->o_base);
-	     e_box_pack_options_set(gcc->o_base,
-				    1, 1, /* fill */
-				    1, 1, /* expand */
-				    0.5, 0.5, /* align */
-				    0, 0, /* min */
-				    -1, -1 /* max */
-				    );
+	     if (gcc->o_base)
+	       {
+		  e_box_pack_end(gcc->o_box, gcc->o_base);
+		  e_box_pack_options_set(gcc->o_base,
+					 1, 1, /* fill */
+					 1, 1, /* expand */
+					 0.5, 0.5, /* align */
+					 0, 0, /* min */
+					 -1, -1 /* max */
+					 );
+	       }
 	     edje_object_part_swallow(gcc->o_frame, gc->edje.swallow_name, gcc->o_box);
 	     evas_object_show(gcc->o_box);
 	     evas_object_show(gcc->o_frame);
@@ -808,9 +827,9 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
      }
    if (gcc->o_frame)
      e_gadcon_layout_pack(gc->o_container, gcc->o_frame);
-   else
+   else if (gcc->o_base)
      e_gadcon_layout_pack(gc->o_container, gcc->o_base);
-   evas_object_show(gcc->o_base);
+   if (gcc->o_base) evas_object_show(gcc->o_base);
    return gcc;
 }
 
@@ -830,7 +849,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
    evas_object_layer_set(gcc->o_control, 100);
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h);
-   else
+   else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h);
    evas_object_move(gcc->o_control, x, y);
    evas_object_resize(gcc->o_control, w, h);
@@ -898,7 +917,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
 	evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move, gcc);
 	evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize, gcc);
      }
-   else
+   else if (gcc->o_base)
      {
 	evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move, gcc);
 	evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize, gcc);
@@ -921,7 +940,7 @@ e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
 	evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move);
 	evas_object_event_callback_del(gcc->o_frame, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize);
      }
-   else
+   else if (gcc->o_base)
      {
 	evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_MOVE, _e_gadcon_cb_client_move);
 	evas_object_event_callback_del(gcc->o_base, EVAS_CALLBACK_RESIZE, _e_gadcon_cb_client_resize);
@@ -963,7 +982,7 @@ e_gadcon_client_show(E_Gadcon_Client *gcc)
 	e_gadcon_layout_pack(gcc->gadcon->o_container, gcc->o_frame);
 	e_gadcon_layout_pack_options_set(gcc->o_frame, gcc);
      }
-   else
+   else if (gcc->o_base)
      {
 	e_gadcon_layout_pack(gcc->gadcon->o_container, gcc->o_base);
 	e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
@@ -982,7 +1001,7 @@ e_gadcon_client_hide(E_Gadcon_Client *gcc)
    if (gcc->o_event) evas_object_hide(gcc->o_event);
    if (gcc->o_frame)
      e_gadcon_layout_unpack(gcc->o_frame);
-   else
+   else if (gcc->o_base)
      e_gadcon_layout_unpack(gcc->o_base);
    gcc->hidden = 1;
 }
@@ -999,7 +1018,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
       case E_GADCON_ORIENT_BOTTOM:
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_size_set(gcc->o_frame, w + gcc->pad.w);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_size_set(gcc->o_base, w);
 	break;
       case E_GADCON_ORIENT_VERT:
@@ -1007,7 +1026,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
       case E_GADCON_ORIENT_RIGHT:
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_size_set(gcc->o_frame, h + gcc->pad.h);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_size_set(gcc->o_base, h);
 	break;
       case E_GADCON_ORIENT_FLOAT:
@@ -1035,7 +1054,7 @@ e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_min_size_set(gcc->o_frame, w + gcc->pad.w, h + gcc->pad.h);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_min_size_set(gcc->o_base, w, h);
      }
    _e_gadcon_moveresize_handle(gcc);
@@ -1055,7 +1074,7 @@ e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h)
 	     e_gadcon_layout_pack_aspect_pad_set(gcc->o_frame, gcc->pad.w, gcc->pad.h);
 	     e_gadcon_layout_pack_aspect_set(gcc->o_frame, w, h);
 	  }
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_aspect_set(gcc->o_base, w, h);
      }
    _e_gadcon_moveresize_handle(gcc);
@@ -1076,7 +1095,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
 	     e_gadcon_layout_pack_aspect_set(gcc->o_frame, 0, 0);
 	     e_gadcon_layout_pack_min_size_set(gcc->o_frame, 0, 0);
 	  }
-	else
+	else if (gcc->o_base)
 	  {
 	     e_gadcon_layout_pack_aspect_set(gcc->o_base, 0, 0);
 	     e_gadcon_layout_pack_min_size_set(gcc->o_base, 0, 0);
@@ -1090,7 +1109,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
 	     e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, gcc->aspect.h);
 	     e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, gcc->min.h);
 	  }
-	else
+	else if (gcc->o_base)
 	  {
 	     e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, gcc->min.h);
 	     e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, gcc->aspect.h);
@@ -1113,7 +1132,7 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
 	     e_gadcon_layout_pack_aspect_set(gcc->o_frame, 0, 0);
 	     e_gadcon_layout_pack_min_size_set(gcc->o_frame, 0, 0);
 	  }
-	else
+	else if (gcc->o_base)
 	  {
 	     e_gadcon_layout_pack_min_size_set(gcc->o_base, 0, 0);
 	     e_gadcon_layout_pack_aspect_set(gcc->o_base, 0, 0);
@@ -1127,7 +1146,7 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable)
 	     e_gadcon_layout_pack_aspect_set(gcc->o_frame, gcc->aspect.w, gcc->aspect.h);
 	     e_gadcon_layout_pack_min_size_set(gcc->o_frame, gcc->min.w, gcc->min.h);
 	  }
-	else
+	else if (gcc->o_base)
 	  {
 	     e_gadcon_layout_pack_min_size_set(gcc->o_base, gcc->min.w, gcc->min.h);
 	     e_gadcon_layout_pack_aspect_set(gcc->o_base, gcc->aspect.w, gcc->aspect.h);
@@ -1143,8 +1162,9 @@ e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    if (!e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gx, &gy, NULL, NULL)) return 0;
-
-   evas_object_geometry_get(gcc->o_base, x, y, w, h);
+   
+   if (gcc->o_base)
+     evas_object_geometry_get(gcc->o_base, x, y, w, h);
    if (x) *x += gx;
    if (y) *y += gy;
 
@@ -1239,9 +1259,17 @@ e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc)
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    if (gcc->o_frame)
-     evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_client_cb_mouse_down, gcc);
-   else
-     evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_client_cb_mouse_down, gcc);
+     {
+	evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_client_cb_mouse_down, gcc);
+	evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_UP, _e_gadcon_client_cb_mouse_up, gcc);
+	evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_MOVE, _e_gadcon_client_cb_mouse_move, gcc);
+     }
+   else if (gcc->o_base)
+     {
+	evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOUSE_DOWN, _e_gadcon_client_cb_mouse_down, gcc);
+	evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOUSE_UP, _e_gadcon_client_cb_mouse_up, gcc);
+	evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_MOUSE_MOVE, _e_gadcon_client_cb_mouse_move, gcc);
+     }
 }
 
 /*
@@ -1300,6 +1328,15 @@ _e_gadcon_free(E_Gadcon *gc)
 static void
 _e_gadcon_client_free(E_Gadcon_Client *gcc)
 {
+   if (gcc->instant_edit_timer)
+     {
+	ecore_timer_del(gcc->instant_edit_timer);
+	gcc->instant_edit_timer = NULL;
+     }
+   if (gcc->o_base)
+     evas_object_event_callback_del(gcc->o_base,
+				    EVAS_CALLBACK_DEL,
+				    _e_gadcon_client_del_hook);
    if (gcc->menu)
      {
         e_menu_post_deactivate_callback_set(gcc->menu, NULL, NULL);
@@ -1337,13 +1374,14 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
 	       h = (w * gcc->aspect.h) / gcc->aspect.w;
 	  }
      }
-   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 */
-			  );
+   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 */
+			    );
 }
 
 static int
@@ -1424,7 +1462,6 @@ _e_gadcon_client_save(E_Gadcon_Client *gcc)
    if (gcc->style)
      gcc->cf->style = evas_stringshare_add(gcc->style);
    gcc->cf->resizable = gcc->resizable;
-
    e_config_save_queue();
 }
 
@@ -1483,7 +1520,7 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
      {
 	if (gcc->o_frame)
 	  evas_object_geometry_get(gcc->o_frame, &cx, &cy, &cw, &ch);
-	else
+	else if (gcc->o_base)
 	  evas_object_geometry_get(gcc->o_base, &cx, &cy, &cw, &ch);
 	if (E_INSIDE(x, y, cx, cy, cw, ch)) return;
      }
@@ -1500,7 +1537,7 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
 	if (gcc2->hidden) continue;
 	if (gcc2->o_frame)
 	  evas_object_geometry_get(gcc2->o_frame, &cx, &cy, &cw, &ch);
-	else
+	else if (gcc2->o_base)
 	  evas_object_geometry_get(gcc2->o_base, &cx, &cy, &cw, &ch);
 	if (e_gadcon_layout_orientation_get(gc->o_container))
 	  {
@@ -1689,11 +1726,8 @@ _e_gadcon_cb_client_resize(void *data, Evas *evas, Evas_Object *obj, void *event
 }
 
 static void
-_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+_e_gadcon_client_move_start(E_Gadcon_Client *gcc)
 {
-   E_Gadcon_Client *gcc;
-   
-   gcc = data;
    evas_object_raise(gcc->o_event);
    evas_object_stack_below(gcc->o_control, gcc->o_event);
    gcc->moving = 1;
@@ -1704,11 +1738,8 @@ _e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char *emissio
 }
 
 static void
-_e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+_e_gadcon_client_move_stop(E_Gadcon_Client *gcc)
 {
-   E_Gadcon_Client *gcc;
-   
-   gcc = data;
    gcc->moving = 0; 
    
    gcc->state_info.state = E_LAYOUT_ITEM_STATE_NONE;
@@ -1717,13 +1748,11 @@ _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission
 }
 
 static void
-_e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+_e_gadcon_client_move_go(E_Gadcon_Client *gcc)
 {
-   E_Gadcon_Client *gcc;
    Evas_Coord x, y, w, h;
    int        cx, cy;
    
-   gcc = data;
    if (!gcc->moving) return;
    evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
    x = cx - gcc->dx;
@@ -1733,12 +1762,12 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
    _e_gadcon_client_current_position_sync(gcc);
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
      {
-	if (abs(cy - gcc->drag.y) > e_config->drag_resist)
+/*	if (abs(cy - gcc->drag.y) > e_config->drag_resist)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else if (x > 0)
+	else*/ if (x > 0)
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
@@ -1753,12 +1782,12 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
      }
    else
      {
-	if (abs(cx - gcc->drag.x) > e_config->drag_resist)
+/*	if (abs(cx - gcc->drag.x) > e_config->drag_resist)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else if (y > 0)
+	else*/ if (y > 0)
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
@@ -1775,14 +1804,14 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
 
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
-   else
+   else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
 
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + x, w);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w);
 
 	gcc->config.size = w;
@@ -1793,7 +1822,7 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h);
 
 	gcc->config.size = h;
@@ -1805,6 +1834,24 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
 }
 
 static void
+_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   _e_gadcon_client_move_start(data);
+}
+
+static void
+_e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   _e_gadcon_client_move_stop(data);
+}
+
+static void
+_e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   _e_gadcon_client_move_go(data);
+}
+
+static void
 _e_gadcon_client_resize_start(E_Gadcon_Client *gcc)
 {
    evas_object_raise(gcc->o_event);
@@ -1851,7 +1898,7 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
 
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
-   else
+   else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
 
    _e_gadcon_client_current_position_sync(gcc);
@@ -1875,7 +1922,7 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
      {
 	if (gcc->o_frame) 
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + x, w - x);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w - x);
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = w;
@@ -1884,7 +1931,7 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h - y);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h - y);
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h; 
@@ -1922,7 +1969,7 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
 
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
-   else
+   else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
 
    _e_gadcon_client_current_position_sync(gcc);
@@ -1946,7 +1993,7 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, w + x);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, w + x);
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = w;
@@ -1955,7 +2002,7 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, h + y);
-	else
+	else if (gcc->o_base)
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, h + y);
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h;
@@ -2017,10 +2064,13 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
 	e_gadcon_client_show(gcc);
 
 	o = gcc->o_frame ? gcc->o_frame : gcc->o_base;
-	if (e_gadcon_layout_orientation_get(gc->o_container))
-	  e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
-	else
-	  e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	if (o)
+	  {
+	     if (e_gadcon_layout_orientation_get(gc->o_container))
+	       e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	     else
+	       e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	  }
 	gcc->state_info.resist = 1;
      }
    else if (ev->data)
@@ -2052,7 +2102,7 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
 		  new_gcc->state_info.flags = gcc->state_info.flags;
 		  if (new_gcc->o_frame)
 		    e_gadcon_layout_pack_options_set(new_gcc->o_frame, new_gcc);
-		  else
+		  else if (new_gcc->o_base)
 		    e_gadcon_layout_pack_options_set(new_gcc->o_base, new_gcc);
 
 		  e_gadcon_client_autoscroll_set(new_gcc, gcc->autoscroll);
@@ -2060,6 +2110,8 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
 		  if (new_gcc->client_class->func.orient)
 		    new_gcc->client_class->func.orient(new_gcc);
 		  new_gcc->state_info.resist = 1;
+		  if (gc->instant_edit)
+		    e_gadcon_client_util_menu_attach(new_gcc);
 	       }
 	  }
      }
@@ -2106,10 +2158,13 @@ _e_gadcon_cb_dnd_move(void *data, const char *type, void *event)
 	_e_gadcon_client_inject(gc, gcc, ev->x + dx, ev->y + dy);
 
 	o = gcc->o_frame ? gcc->o_frame : gcc->o_base;
-	if (e_gadcon_layout_orientation_get(gc->o_container))
-	  e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
-	else
-	  e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	if (o)
+	  {
+	     if (e_gadcon_layout_orientation_get(gc->o_container))
+	       e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	     else
+	       e_gadcon_layout_pack_request_set(o, gcc->config.pos, gcc->config.size);
+	  }
 	e_gadcon_layout_thaw(gc->o_container);
      }
 }
@@ -2179,6 +2234,18 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m)
    gcc->menu = NULL;
 }
 
+static int
+_e_gadcon_client_cb_instant_edit_timer(void *data)
+{
+   E_Gadcon_Client *gcc;
+   
+   gcc = data;
+   e_gadcon_client_edit_begin(gcc);
+   _e_gadcon_client_move_start(gcc);
+   gcc->instant_edit_timer = NULL;
+   return 0;
+}
+
 static void
 _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -2211,6 +2278,57 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
 	e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
 					ev->button);
      }
+   else if (ev->button == 1)
+     {
+	if ((!gcc->o_control) && (gcc->gadcon->instant_edit))
+	  {
+	     if (gcc->instant_edit_timer) ecore_timer_del(gcc->instant_edit_timer);
+	     gcc->instant_edit_timer = 
+	       ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer, 
+			       gcc);
+	  }
+     }
+}
+
+static void
+_e_gadcon_client_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Up *ev;
+   E_Gadcon_Client *gcc;
+   
+   ev = event_info;
+   gcc = data;
+   
+   if ((ev->button == 1) && (gcc->gadcon->instant_edit))
+     {
+	if (gcc->instant_edit_timer)
+	  {
+	     ecore_timer_del(gcc->instant_edit_timer);
+	     gcc->instant_edit_timer = NULL;
+	  }
+	if (gcc->o_control)
+	  {
+	     printf("EDIT END\n");
+	     _e_gadcon_client_move_stop(gcc);
+	     e_gadcon_client_edit_end(gcc);
+	  }
+     }
+}
+
+static void
+_e_gadcon_client_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   E_Gadcon_Client *gcc;
+   
+   ev = event_info;
+   gcc = data;
+   
+   if ((gcc->gadcon->instant_edit))
+     {
+	if (gcc->o_control)
+	  _e_gadcon_client_move_go(gcc);
+     }
 }
 
 static void
@@ -2298,6 +2416,21 @@ _e_gadcon_client_cb_menu_remove(void *data, E_Menu *m, E_Menu_Item *mi)
    e_config_save_queue();
 }
 
+static void
+_e_gadcon_client_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   E_Gadcon_Client *gcc;
+
+   gcc = data;
+   gcc->o_base = NULL;
+   if (gcc->o_frame)
+     {
+	evas_object_del(gcc->o_frame);
+	gcc->o_frame = NULL;
+     }
+   e_object_del(E_OBJECT(gcc));
+}
+
 /* a smart object JUST for gadcon */
 
 typedef struct _E_Gadcon_Layout_Item  E_Gadcon_Layout_Item;
@@ -2704,7 +2837,7 @@ _e_gadcon_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
    evas_object_clip_set(obj, sd->clip);
    evas_object_smart_member_add(obj, bi->sd->obj);
    evas_object_data_set(obj, "e_gadcon_layout_data", bi);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
 				  _e_gadcon_layout_smart_item_del_hook, NULL);
    if ((!evas_object_visible_get(sd->clip)) &&
        (evas_object_visible_get(sd->obj)))
@@ -2727,7 +2860,7 @@ _e_gadcon_layout_smart_disown(Evas_Object *obj)
 	  evas_object_hide(bi->sd->clip);
      }
    evas_object_event_callback_del(obj,
-				  EVAS_CALLBACK_FREE,
+				  EVAS_CALLBACK_DEL,
 				  _e_gadcon_layout_smart_item_del_hook);
    evas_object_smart_member_del(obj);
    evas_object_clip_unset(obj);
@@ -2831,7 +2964,8 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
    for (l = sd->items, i = 1; l; l = l->next, i++)
      {
 	bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); 
-	bi->gcc->state_info.seq = i; 
+	if (bi->gcc->gadcon->editing)
+	  bi->gcc->state_info.seq = i; 
 
 	if (set_prev_pos)
 	  {
@@ -3474,8 +3608,11 @@ _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc)
    Evas_Object *o;
 
    o = gcc->o_frame ? gcc->o_frame : gcc->o_base;
-   bi = evas_object_data_get(o, "e_gadcon_layout_data");
-   if (!bi) return;
+   if (o)
+     {
+	bi = evas_object_data_get(o, "e_gadcon_layout_data");
+	if (!bi) return;
+     }
    
    gcc->state_info.prev_pos = gcc->config.pos;
    gcc->state_info.prev_size = gcc->config.size;
@@ -3495,7 +3632,6 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
 
    sd->items = evas_list_sort(sd->items, evas_list_count(sd->items),
 			      _e_gadcon_layout_smart_sort_by_sequence_number_cb); 
-   
    for (l = sd->items; l; l = l->next) 
      { 
 	bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); 
@@ -3504,7 +3640,7 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
 	     if (bi->gcc->state_info.resist <= E_LAYOUT_ITEM_DRAG_RESIST_LEVEL) 
 	       { 
 		  bi->gcc->state_info.resist++; 
-		  bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos; 
+		  bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
 	       } 
 	     else 
 	       { 
@@ -3788,7 +3924,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
 	_e_gadcon_layout_smart_gadcons_position_static(sd, list);
 	return;
      } 
-   
+
    lc_moving_prev_pos = lc_moving->prev_pos;
    if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC) 
      { 
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index 14cb49b..2083a1c 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -93,6 +93,8 @@ struct _E_Gadcon
    E_Drop_Handler *drop_handler;
 
    E_Config_Gadcon *cf;
+
+   unsigned char          instant_edit : 1;
 };
 
 #define GADCON_CLIENT_CLASS_VERSION 2
@@ -100,7 +102,7 @@ struct _E_Gadcon_Client_Class
 {
    int   version;
    /* All members below are part of version 1 */
-   char *name;
+   const char *name;
    struct 
      {
 	E_Gadcon_Client *(*init)     (E_Gadcon *gc, const char *name, const char *id, const char *style);
@@ -149,6 +151,7 @@ struct _E_Gadcon_Client
 	Evas_Coord        w, h;
      } pad, min, aspect;
    Ecore_Timer           *scroll_timer;
+   Ecore_Timer           *instant_edit_timer;
    Ecore_Animator        *scroll_animator;
    double                 scroll_pos;
    double                 scroll_wanted;
diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index c7bdc16..f0913df 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -176,8 +176,5 @@ _e_gadcon_popup_free(E_Gadcon_Popup *pop)
 {
    pop->gcc = NULL;
    e_object_del(E_OBJECT(pop->win));
-   if (pop->pinned) e_gadcon_popup_toggle_pinned(pop);
-   if (pop->o_bg) evas_object_del(pop->o_bg);
-   if (pop->o_con) evas_object_del(pop->o_con);
    free(pop);
 }
diff --git a/src/bin/e_gadcon_popup.h b/src/bin/e_gadcon_popup.h
index 1fabc7d..9dba115 100644
--- a/src/bin/e_gadcon_popup.h
+++ b/src/bin/e_gadcon_popup.h
@@ -18,7 +18,7 @@ struct _E_Gadcon_Popup
    E_Popup	       *win;
    E_Gadcon_Client     *gcc;
    Evas_Coord		w, h;
-   Evas_Object	       *o_bg, *o_con;
+   Evas_Object	       *o_bg;
 
    int			pinned : 1;
 
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 25ef820..43abcca 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -3,12 +3,17 @@
  */
 #include "e.h"
 
+Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
+Ecore_X_Atom _QTOPIA_SOFT_MENUS = 0;
+
 EAPI void
 e_hints_init(void)
 {
    Ecore_X_Window *roots = NULL;
    int num;
 
+   _QTOPIA_SOFT_MENU = ecore_x_atom_get("_QTOPIA_SOFT_MENU");
+   _QTOPIA_SOFT_MENUS = ecore_x_atom_get("_QTOPIA_SOFT_MENUS");
    roots = ecore_x_window_root_list(&num);
    if (roots)
      {
@@ -656,7 +661,36 @@ e_hints_window_type_set(E_Border *bd)
 EAPI void
 e_hints_window_type_get(E_Border *bd)
 {
-   ecore_x_netwm_window_type_get(bd->client.win, &bd->client.netwm.type);
+   Ecore_X_Window_Type *types = NULL;
+   int num, i;
+   
+   num = ecore_x_netwm_window_types_get(bd->client.win, &types);
+   if (bd->client.netwm.extra_types)
+     {
+	free(bd->client.netwm.extra_types);
+	bd->client.netwm.extra_types = NULL;
+	bd->client.netwm.extra_types_num = 0;
+     }
+   if (num == 0) 
+     {
+	bd->client.netwm.type = ECORE_X_WINDOW_TYPE_UNKNOWN;
+     }
+   else
+     {
+	bd->client.netwm.type = types[0];
+	if (num > 1)
+	  {
+	     bd->client.netwm.extra_types = 
+	       malloc((num - 1) * sizeof(Ecore_X_Window_Type));
+	     if (bd->client.netwm.extra_types)
+	       {
+		  for (i = 1; i < num; i++)
+		    bd->client.netwm.extra_types[i - 1] = types[i];
+		  bd->client.netwm.extra_types_num = num - 1;
+	       }
+	  }
+	free(types);
+     }
 }
 
 EAPI void
@@ -1306,6 +1340,28 @@ e_hints_window_e_state_set(E_Border *bd)
 }
 
 EAPI void
+e_hints_window_qtopia_soft_menu_get(E_Border *bd)
+{
+   unsigned int val;
+   
+   if (ecore_x_window_prop_card32_get(bd->client.win, _QTOPIA_SOFT_MENU, &val, 1))
+     bd->client.qtopia.soft_menu = val;
+   else
+     bd->client.qtopia.soft_menu = 0;
+}
+
+EAPI void
+e_hints_window_qtopia_soft_menus_get(E_Border *bd)
+{
+   unsigned int val;
+
+   if (ecore_x_window_prop_card32_get(bd->client.win, _QTOPIA_SOFT_MENUS, &val, 1))
+     bd->client.qtopia.soft_menus = val;
+   else
+     bd->client.qtopia.soft_menus = 0;
+}
+
+EAPI void
 e_hints_openoffice_gnome_fake(Ecore_X_Window root)
 {
    Ecore_X_Atom gnome_atom, string_atom;
@@ -1325,3 +1381,4 @@ e_hints_openoffice_kde_fake(Ecore_X_Window root)
    win2 = ecore_x_window_new(root, -20, -20, 1, 1);
    ecore_x_netwm_wm_identify(root, win2, "KWin");
 }
+
diff --git a/src/bin/e_hints.h b/src/bin/e_hints.h
index 7d98c46..ab79e28 100644
--- a/src/bin/e_hints.h
+++ b/src/bin/e_hints.h
@@ -45,8 +45,14 @@ EAPI void e_hints_window_desktop_set(E_Border *bd);
 EAPI void e_hints_window_e_state_set(E_Border *bd);
 EAPI void e_hints_window_e_state_get(E_Border *bd);
 
+EAPI void e_hints_window_qtopia_soft_menu_get(E_Border *bd);
+EAPI void e_hints_window_qtopia_soft_menus_get(E_Border *bd);
+
 EAPI void e_hints_openoffice_gnome_fake(Ecore_X_Window root);
 EAPI void e_hints_openoffice_kde_fake(Ecore_X_Window root);
-    
+
+extern EAPI Ecore_X_Atom _QTOPIA_SOFT_MENU;
+extern EAPI Ecore_X_Atom _QTOPIA_SOFT_MENUS;
+
 #endif
 #endif
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index 8a7610a..ebf4e30 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -9,6 +9,7 @@ struct _E_Smart_Data
 { 
    Evas_Coord   x, y, w, h;
    Evas_Object *obj;
+   int          size;
    char         fill_inside : 1;
 }; 
 
@@ -44,7 +45,9 @@ e_icon_file_set(Evas_Object *obj, const char *file)
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    /* smart code here */
-   evas_object_image_load_size_set(sd->obj, 64, 64);
+   /* FIXME: 64x64 - unhappy about this. use icon size */
+   if (sd->size != 0)
+     evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, NULL);
    _e_icon_smart_reconfigure(sd);
 }
@@ -57,7 +60,8 @@ e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    /* smart code here */
-   evas_object_image_load_size_set(sd->obj, 64, 64);
+   if (sd->size != 0)
+     evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, key);
    _e_icon_smart_reconfigure(sd);
 }
@@ -215,6 +219,29 @@ e_icon_data_get(Evas_Object *obj, int *w, int *h)
    return evas_object_image_data_get(sd->obj, 0);
 }
 
+EAPI void
+e_icon_scale_size_set(Evas_Object *obj, int size)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   sd->size = size;
+   if (!strcmp(evas_object_type_get(sd->obj), "edje"))
+     return;   
+   evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+}
+
+EAPI int
+e_icon_scale_size_get(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return 0;
+   return sd->size;
+}
+
 /* local subsystem globals */
 static void
 _e_icon_smart_reconfigure(E_Smart_Data *sd)
@@ -305,6 +332,7 @@ _e_icon_smart_add(Evas_Object *obj)
    sd->w = 0;
    sd->h = 0;
    sd->fill_inside = 1;
+   sd->size = 64;
    evas_object_smart_member_add(sd->obj, obj);
    evas_object_smart_data_set(obj, sd);
 }
diff --git a/src/bin/e_icon.h b/src/bin/e_icon.h
index b459508..3b4636c 100644
--- a/src/bin/e_icon.h
+++ b/src/bin/e_icon.h
@@ -21,6 +21,8 @@ EAPI int          e_icon_fill_inside_get  (Evas_Object *obj);
 EAPI void         e_icon_fill_inside_set  (Evas_Object *obj, int fill_inside);
 EAPI void         e_icon_data_set         (Evas_Object *obj, void *data, int w, int h);
 EAPI void        *e_icon_data_get         (Evas_Object *obj, int *w, int *h);
-    
+EAPI void         e_icon_scale_size_set   (Evas_Object *obj, int size);
+EAPI int          e_icon_scale_size_get   (Evas_Object *obj);
+
 #endif
 #endif
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index efc13fa..dab1093 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -11,8 +11,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
 struct _E_Smart_Data 
 {
    Evas_Coord x, y, w, h, iw, ih;
-   Evas_Object *o_smart;
-   Evas_Object *o_box;
+   Evas_Object *o_smart, *o_box;
    Evas_List *items;
    int selected;
    unsigned char selector : 1;
@@ -49,12 +48,12 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
 {
    E_Ilist_Item *si;
    Evas_Coord mw = 0, mh = 0;
-   
+
    API_ENTRY return;
    si = E_NEW(E_Ilist_Item, 1);
    si->sd = sd;
    si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-   
+
    if (header) 
      e_theme_edje_object_set(si->o_base, "base/theme/widgets", 
 			     "e/widgets/ilist_header");
@@ -79,14 +78,14 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
    si->data2 = data2;
    si->header = header;
    sd->items = evas_list_append(sd->items, si);
-   
+
    edje_object_size_min_calc(si->o_base, &mw, &mh);
    e_box_freeze(sd->o_box);
    e_box_pack_end(sd->o_box, si->o_base);
    e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5, 
 			  mw, mh, 99999, 99999);
    e_box_thaw(sd->o_box);
-   
+
    evas_object_lower(sd->o_box);
    evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
 				  _e_smart_event_mouse_down, si);
@@ -100,12 +99,12 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
 {
    E_Ilist_Item *si, *ri;
    Evas_Coord mw = 0, mh = 0;
-   
+
    API_ENTRY return;
    si = E_NEW(E_Ilist_Item, 1);
    si->sd = sd;
    si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-   
+
    if (header) 
      e_theme_edje_object_set(si->o_base, "base/theme/widgets", 
 			     "e/widgets/ilist_header");
@@ -129,13 +128,13 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
    si->data = data;
    si->data2 = data2;
    si->header = header;
-   
+
    ri = evas_list_nth(sd->items, relative);
    if (ri)
      sd->items = evas_list_append_relative(sd->items, si, ri);
    else
      sd->items = evas_list_append(sd->items, si);
-     
+
    edje_object_size_min_calc(si->o_base, &mw, &mh);
    e_box_freeze(sd->o_box);
    if (ri)
@@ -145,7 +144,7 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
    e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5, 
 			  mw, mh, 99999, 99999);
    e_box_thaw(sd->o_box);
-   
+
    evas_object_lower(sd->o_box);
    evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
 				  _e_smart_event_mouse_down, si);
@@ -159,12 +158,12 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, int head
 {
    E_Ilist_Item *si;
    Evas_Coord mw = 0, mh = 0;
-   
+
    API_ENTRY return;
    si = E_NEW(E_Ilist_Item, 1);
    si->sd = sd;
    si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-   
+
    if (header) 
      e_theme_edje_object_set(si->o_base, "base/theme/widgets", 
 			     "e/widgets/ilist_header");
@@ -189,14 +188,14 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, int head
    si->data2 = data2;
    si->header = header;
    sd->items = evas_list_prepend(sd->items, si);
-   
+
    edje_object_size_min_calc(si->o_base, &mw, &mh);
    e_box_freeze(sd->o_box);
    e_box_pack_start(sd->o_box, si->o_base);
    e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5, 
 			  mw, mh, 99999, 99999);
    e_box_thaw(sd->o_box);
-   
+
    evas_object_lower(sd->o_box);
    evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
 				  _e_smart_event_mouse_down, si);
@@ -210,12 +209,12 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
 {
    E_Ilist_Item *si, *ri;
    Evas_Coord mw = 0, mh = 0;
-   
+
    API_ENTRY return;
    si = E_NEW(E_Ilist_Item, 1);
    si->sd = sd;
    si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
-   
+
    if (header) 
      e_theme_edje_object_set(si->o_base, "base/theme/widgets", 
 			     "e/widgets/ilist_header");
@@ -239,13 +238,13 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
    si->data = data;
    si->data2 = data2;
    si->header = header;
-   
+
    ri = evas_list_nth(sd->items, relative);
    if (ri) 
      sd->items = evas_list_prepend_relative(sd->items, si, ri);
    else 
      sd->items = evas_list_prepend(sd->items, si);
-   
+
    edje_object_size_min_calc(si->o_base, &mw, &mh);
    e_box_freeze(sd->o_box);
    if (ri)
@@ -255,7 +254,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
    e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5, 
 			  mw, mh, 99999, 99999);
    e_box_thaw(sd->o_box);
-   
+
    evas_object_lower(sd->o_box);
    evas_object_event_callback_add(si->o_base, EVAS_CALLBACK_MOUSE_DOWN,
 				  _e_smart_event_mouse_down, si);
@@ -268,12 +267,13 @@ EAPI void
 e_ilist_clear(Evas_Object *obj) 
 {
    API_ENTRY return;
+
    e_ilist_freeze(obj);
    while (sd->items) 
      {
-	E_Ilist_Item *si;
-	
-	si = sd->items->data;
+	E_Ilist_Item *si = NULL;
+
+	if (!(si = sd->items->data)) continue;
 	sd->items = evas_list_remove_list(sd->items, sd->items);
 	if (si->o_icon) evas_object_del(si->o_icon);
 	evas_object_del(si->o_base);
@@ -342,17 +342,17 @@ e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 EAPI void 
 e_ilist_unselect(Evas_Object *obj) 
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    API_ENTRY return;
+
    if (!sd->items) return;
    if (sd->selected < 0) return;
    for (l = sd->items; l; l = l->next) 
      {
-	E_Ilist_Item *si;
-	
-	si = l->data;
-	if (!si) continue;
+	E_Ilist_Item *si = NULL;
+
+	if (!(si = l->data)) continue;
 	if (!si->selected) continue;
 	edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
 	si->selected = 0;
@@ -363,28 +363,30 @@ e_ilist_unselect(Evas_Object *obj)
 EAPI void 
 e_ilist_selected_set(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
-   Evas_List *l;
+   E_Ilist_Item *si = NULL;
+   Evas_List *l = NULL;
    int i;
-   
+
    API_ENTRY return;
    if (!sd->items) return;
-   
+
    i = evas_list_count(sd->items);
    if (n >= i) n = i - 1;
    else if (n < 0) n = 0;
 
    for (l = sd->items; l; l = l->next) 
      {
-	si = l->data;
-	if (!si) continue;
-	if (!si->selected) continue;
+	if (!(si = l->data)) continue;
+	if ((!si->selected) || (si->header)) continue;
 	edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
 	si->selected = 0;
      }
    sd->selected = -1;
-   si = evas_list_nth(sd->items, n);
-   if (!si) return;
+   if (!(si = evas_list_nth(sd->items, n))) return;
+
+   /* NB: Remove this if headers ever become selectable */
+   if (si->header) return;
+
    si->selected = 1;
    sd->selected = n;
    evas_object_raise(si->o_base);
@@ -400,9 +402,9 @@ e_ilist_selected_set(Evas_Object *obj, int n)
 EAPI int 
 e_ilist_selected_get(Evas_Object *obj) 
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
    int i, j;
-   
+
    API_ENTRY return -1;
    if (!sd->items) return -1;
    if (!sd->multi_select)
@@ -412,10 +414,9 @@ e_ilist_selected_get(Evas_Object *obj)
 	j = -1;
 	for (i = 0, l = sd->items; l; l = l->next, i++) 
 	  {
-	     E_Ilist_Item *li;
-	     
-	     li = l->data;
-	     if (!li) continue;
+	     E_Ilist_Item *li = NULL;
+
+	     if (!(li = l->data)) continue;
 	     if (li->selected) j = i;
 	  }
 	return j;
@@ -425,8 +426,8 @@ e_ilist_selected_get(Evas_Object *obj)
 EAPI const char *
 e_ilist_selected_label_get(Evas_Object *obj) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    if (sd->multi_select) return NULL;
@@ -439,8 +440,8 @@ e_ilist_selected_label_get(Evas_Object *obj)
 EAPI void *
 e_ilist_selected_data_get(Evas_Object *obj) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    if (sd->multi_select) return NULL;
@@ -453,8 +454,8 @@ e_ilist_selected_data_get(Evas_Object *obj)
 EAPI void *
 e_ilist_selected_data2_get(Evas_Object *obj) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    if (sd->multi_select) return NULL;
@@ -467,8 +468,8 @@ e_ilist_selected_data2_get(Evas_Object *obj)
 EAPI Evas_Object *
 e_ilist_selected_icon_get(Evas_Object *obj) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    if (sd->multi_select) return NULL;
@@ -481,13 +482,12 @@ e_ilist_selected_icon_get(Evas_Object *obj)
 EAPI void 
 e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return;
    if (!sd->items) return;
    if (sd->selected < 0) return;
-   si = evas_list_nth(sd->items, sd->selected);
-   if (!si) return;
+   if (!(si = evas_list_nth(sd->items, sd->selected))) return;
    evas_object_geometry_get(si->o_base, x, y, w, h);
    *x -= sd->x;
    *y -= sd->y;
@@ -498,15 +498,14 @@ e_ilist_selected_count_get(Evas_Object *obj)
 {
    Evas_List *l = NULL;
    int count = 0;
-   
+
    API_ENTRY return 0;
    if (!sd->items) return 0;
    for (l = sd->items; l; l = l->next) 
      {
-	E_Ilist_Item *si;
-	
-	si = l->data;
-	if (!si) continue;
+	E_Ilist_Item *si = NULL;
+
+	if (!(si = l->data)) continue;
 	if (si->selected) count++;
      }
    return count;
@@ -515,12 +514,11 @@ e_ilist_selected_count_get(Evas_Object *obj)
 EAPI void 
 e_ilist_remove_num(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return;
    if (!sd->items) return;
-   si = evas_list_nth(sd->items, n);
-   if (!si) return;
+   if (!(si = evas_list_nth(sd->items, n))) return;
    sd->items = evas_list_remove(sd->items, si);
    if (sd->selected == n) sd->selected = -1;
    if (si->o_icon) evas_object_del(si->o_icon);
@@ -531,8 +529,8 @@ e_ilist_remove_num(Evas_Object *obj, int n)
 EAPI const char *
 e_ilist_nth_label_get(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    si = evas_list_nth(sd->items, n);
@@ -543,11 +541,13 @@ e_ilist_nth_label_get(Evas_Object *obj, int n)
 EAPI void 
 e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
+   /* check for a NULL label first...simplier, faster check then doing
+    * API_ENTRY check first */
+   if (!label) return;
    API_ENTRY return;
    if (!sd->items) return;
-   if (!label) return;
    si = evas_list_nth(sd->items, n);
    if (si) edje_object_part_text_set(si->o_base, "e.text.label", label);
 }
@@ -555,8 +555,8 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
 EAPI Evas_Object *
 e_ilist_nth_icon_get(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return NULL;
    if (!sd->items) return NULL;
    si = evas_list_nth(sd->items, n);
@@ -567,12 +567,11 @@ e_ilist_nth_icon_get(Evas_Object *obj, int n)
 EAPI void 
 e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return;
    if (!sd->items) return;
-   si = evas_list_nth(sd->items, n);
-   if (!si) return;
+   if (!(si = evas_list_nth(sd->items, n))) return;
    if (si->o_icon) 
      {
 	edje_object_part_unswallow(si->o_base, si->o_icon);
@@ -590,8 +589,8 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
 EAPI int 
 e_ilist_nth_is_header(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
-   
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return 0;
    if (!sd->items) return 0;
    si = evas_list_nth(sd->items, n);
@@ -602,14 +601,11 @@ e_ilist_nth_is_header(Evas_Object *obj, int n)
 EAPI void
 e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
-  E_Ilist_Item *si;
+  E_Ilist_Item *si = NULL;
 
   API_ENTRY return;
   if (!sd->items) return;
-
-  si = evas_list_nth(sd->items, n);
-  if (!si) return;
-
+  if (!(si = evas_list_nth(sd->items, n))) return;
   evas_object_geometry_get(si->o_base, x, y, w, h);
   *x -= sd->x;
   *y -= sd->y;
@@ -618,19 +614,18 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y,
 EAPI void 
 e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 
 {
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    API_ENTRY return;
    if ((sd->iw == w) && (sd->ih == h)) return;
    sd->iw = w;
    sd->ih = h;
    for (l = sd->items; l; l = l->next) 
      {
-	E_Ilist_Item *si;
+	E_Ilist_Item *si = NULL;
 	Evas_Coord mw = 0, mh = 0;
-	
-	si = l->data;
-	if (!si) continue;
+
+	if (!(si = l->data)) continue;
 	if (!si->o_icon) continue;
 	edje_extern_object_min_size_set(si->o_icon, w, h);
 	edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
@@ -650,19 +645,17 @@ e_ilist_items_get(Evas_Object *obj)
 EAPI void 
 e_ilist_multi_select(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
+   E_Ilist_Item *si = NULL;
    int i;
-   
+
    API_ENTRY return;
-   if (!sd->items) return;
-   if (!sd->multi_select) return;
-   
+   if ((!sd->items) || (!sd->multi_select)) return;
+
    i = evas_list_count(sd->items);
    if (n >= i) n = i - 1;
    else if (n < 0) n = 0;
-   
-   si = evas_list_nth(sd->items, n);
-   if (!si) return;
+
+   if (!(si = evas_list_nth(sd->items, n))) return;
    sd->selected = n;
    if (si->selected) 
      {
@@ -690,22 +683,20 @@ e_ilist_multi_select(Evas_Object *obj, int n)
 EAPI void 
 e_ilist_range_select(Evas_Object *obj, int n) 
 {
-   E_Ilist_Item *si;
+   E_Ilist_Item *si = NULL;
    int i, j, dir;
-   
+
    API_ENTRY return;
-   if (!sd->items) return;
-   if (!sd->multi_select) return;
-   
+   if ((!sd->items) || (!sd->multi_select)) return;
+
    i = evas_list_count(sd->items);
    if (n >= i) n = i - 1;
    else if (n < 0) n = 0;
 
    if (n < sd->selected) dir = 0;
    else dir = 1;
-   
-   si = evas_list_nth(sd->items, n);
-   if (!si) return;
+
+   if (!(si = evas_list_nth(sd->items, n))) return;
    if (dir == 1) 
      {
 	for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++) 
@@ -747,17 +738,17 @@ static void
 _e_smart_add(Evas_Object *obj) 
 {
    E_Smart_Data *sd;
-   
+
    sd = calloc(1, sizeof(E_Smart_Data));
    if (!sd) return;
    evas_object_smart_data_set(obj, sd);
-   
+
    sd->o_smart = obj;
    sd->x = sd->y = sd->w = sd->h = 0;
    sd->iw = sd->ih = 24;
    sd->selected = -1;
    sd->multi_select = 0;
-   
+
    sd->o_box = e_box_add(evas_object_evas_get(obj));
    e_box_align_set(sd->o_box, 0.0, 0.0);
    e_box_homogenous_set(sd->o_box, 0);
@@ -844,17 +835,19 @@ _e_smart_event_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_
    E_Smart_Data *sd;
    Evas_Event_Mouse_Down *ev;
    E_Ilist_Item *si;
-   Evas_List *l;
+   Evas_List *l = NULL;
    int i;
 
    ev = event_info;
    si = data;
    sd = si->sd;
-   
+
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
    else sd->on_hold = 0;
-   
+
+   /* NB: Remove if headers ever become selectable */
    if (si->header) return;
+
    if (!sd->items) return;
    for (i = 0, l = sd->items; l; l = l->next, i++) 
      {
@@ -874,7 +867,7 @@ _e_smart_event_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_
 	     break;
 	  }
      }
-   
+
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      evas_object_smart_callback_call(sd->o_smart, "selected", NULL);
 }
@@ -892,12 +885,12 @@ _e_smart_event_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_in
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
    else sd->on_hold = 0;
-   
+
+   /* NB: Remove if headers ever become selectable */
    if (si->header) return;
-   if (!sd->items) return;
-   if (!sd->selector) return;
-   si = evas_list_nth(sd->items, sd->selected);
-   if (!si) return;
+
+   if ((!sd->items) || (!sd->selector)) return;
+   if (!(si = evas_list_nth(sd->items, sd->selected))) return;
    if (sd->on_hold)
      {
 	sd->on_hold = 0;
@@ -913,14 +906,14 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
    E_Smart_Data *sd;
    E_Ilist_Item *si;
    int n, ns;
-   
+
    sd = data;
    ev = event_info;
    ns = sd->selected;
-   
+
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
    else sd->on_hold = 0;
-   
+
    if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
      {
 	n = ns;
@@ -931,7 +924,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
 		  n = ns;
 		  break;
 	       }
-	     -- n;
+	     --n;
 	     si = evas_list_nth(sd->items, n);
 	  }
 	while ((si) && (si->header));
@@ -957,7 +950,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
 		  n = ns;
 		  break;
 	       }
-	     ++ n;
+	     ++n;
 	     si = evas_list_nth(sd->items, n);
 	  }
 	while ((si) && (si->header));
@@ -983,7 +976,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
 		  n = ns;
 		  break;
 	       }
-	     ++ n;
+	     ++n;
 	     si = evas_list_nth(sd->items, n);
 	  }
 	while ((si) && (si->header));
@@ -1009,7 +1002,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
 		  n = ns;
 		  break;
 	       }
-	     -- n;
+	     --n;
 	     si = evas_list_nth(sd->items, n);
 	  }
 	while ((si) && (si->header));
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 175f86c..09c1bb2 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -132,3 +132,6 @@
 #include "e_toolbar.h"
 #include "e_int_toolbar_config.h"
 #include "e_powersave.h"
+#include "e_slidesel.h"
+#include "e_slidecore.h"
+#include "e_widget_flist.h"
diff --git a/src/bin/e_init_main.c b/src/bin/e_init_main.c
index 9ad35ec..54ff2ec 100644
--- a/src/bin/e_init_main.c
+++ b/src/bin/e_init_main.c
@@ -460,6 +460,13 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
 	ecore_evas_xrender_x11_direct_resize_set(ee, 1);
 	*winret = ecore_evas_xrender_x11_window_get(ee);
      }
+   else if (engine == 4)
+     {
+        ee = ecore_evas_software_x11_16_new(NULL, root, 0, 0, w, h);
+	ecore_evas_override_set(ee, 1);
+	ecore_evas_software_x11_16_direct_resize_set(ee, 1);
+	*winret = ecore_evas_software_x11_16_window_get(ee);
+     }
    
    e = ecore_evas_get(ee);
    
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index c87347a..f7e8696 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -24,6 +24,7 @@ static void _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_pin(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -44,7 +45,7 @@ static void _e_border_menu_cb_default_icon(void *data, E_Menu *m, E_Menu_Item *m
 static void _e_border_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi);
 
 EAPI void
-e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_Time timestamp)
+e_int_border_menu_create(E_Border *bd)
 {
    E_Menu *m;
    E_Menu_Item *mi;
@@ -371,10 +372,16 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
 	  }
      }
 
+}
+	
+EAPI void
+e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_Time timestamp)
+{
+   e_int_border_menu_create(bd);
    if (key)
-     e_menu_activate_key(m, bd->zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN);
+     e_menu_activate_key(bd->border_menu, bd->zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN);
    else
-     e_menu_activate_mouse(m, bd->zone, x, y, 1, 1,
+     e_menu_activate_mouse(bd->border_menu, bd->zone, x, y, 1, 1,
 			   E_MENU_POP_DIRECTION_DOWN, timestamp);
 }
 
@@ -660,6 +667,7 @@ _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi)
      bd->user_skip_winlist = e_menu_item_toggle_get(mi);
    else
      bd->user_skip_winlist = 0;
+   bd->changed = 1;
    if (bd->remember) e_remember_update(bd->remember, bd);
 }
 
@@ -680,6 +688,22 @@ _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi)
 }
 
 static void
+_e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Border *bd;
+
+   bd = data;
+   if (!bd) return;
+
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus))
+     bd->client.netwm.state.skip_taskbar = e_menu_item_toggle_get(mi);
+   else
+     bd->client.netwm.state.skip_taskbar = 0;
+   bd->changed = 1;
+   if (bd->remember) e_remember_update(bd->remember, bd);
+}
+
+static void
 _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Menu *subm;
@@ -985,6 +1009,16 @@ _e_border_menu_cb_skip(void *data, E_Menu *m, E_Menu_Item *mi)
 			     e_theme_edje_file_get("base/theme/borders",
 						   "e/widgets/border/default/skip_pager"),
 			     "e/widgets/border/default/skip_pager");
+
+   submi = e_menu_item_new(subm);
+   e_menu_item_label_set(submi, _("Taskbar"));
+   e_menu_item_check_set(submi, 1);
+   e_menu_item_toggle_set(submi, bd->client.netwm.state.skip_taskbar);
+   e_menu_item_callback_set(submi, _e_border_menu_cb_skip_taskbar, bd);
+   e_menu_item_icon_edje_set(submi,
+			     e_theme_edje_file_get("base/theme/borders",
+						   "e/widgets/border/default/skip_taskbar"),
+			     "e/widgets/border/default/skip_taskbar");
 }
 
 static void
diff --git a/src/bin/e_int_border_menu.h b/src/bin/e_int_border_menu.h
index 1e20bbb..42819af 100644
--- a/src/bin/e_int_border_menu.h
+++ b/src/bin/e_int_border_menu.h
@@ -7,6 +7,7 @@
 #ifndef E_INT_BORDER_MENU_H
 #define E_INT_BORDER_MENU_H
 
+EAPI void e_int_border_menu_create(E_Border *bd);
 EAPI void e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_Time timestamp);
 EAPI void e_int_border_menu_del(E_Border *bd);
 
diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c
index 903a80b..52f56ac 100644
--- a/src/bin/e_int_border_remember.c
+++ b/src/bin/e_int_border_remember.c
@@ -42,6 +42,8 @@ struct _E_Config_Dialog_Data
       int apply_shade;
       int apply_zone;
       int apply_skip_winlist;
+      int apply_skip_pager;
+      int apply_skip_taskbar;
       int apply_run;
       int apply_icon_pref;
       int set_focus_on_start;
@@ -99,6 +101,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SHADE) cfdata->remember.apply_shade = 1;
 	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_ZONE) cfdata->remember.apply_zone = 1;
 	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_WINLIST) cfdata->remember.apply_skip_winlist = 1;
+	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_PAGER) cfdata->remember.apply_skip_pager = 1;
+	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_TASKBAR) cfdata->remember.apply_skip_taskbar = 1;
 	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_RUN) cfdata->remember.apply_run = 1;
 	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_ICON_PREF) cfdata->remember.apply_icon_pref = 1;
 	if (cfdata->border->remember->apply & E_REMEMBER_SET_FOCUS_ON_START) cfdata->remember.set_focus_on_start = 1;
@@ -110,6 +114,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	    (cfdata->remember.apply_border) && (cfdata->remember.apply_sticky) &&
 	    (cfdata->remember.apply_desktop) && (cfdata->remember.apply_shade) &&
 	    (cfdata->remember.apply_zone) && (cfdata->remember.apply_skip_winlist) &&
+	    (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_skip_taskbar) &&
 	    (cfdata->remember.set_focus_on_start))
      cfdata->mode = MODE_ALL;
    else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
@@ -262,7 +267,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      {
 	cfdata->border->remember = e_remember_new();
 	if (cfdata->border->remember)
-	     e_remember_use(cfdata->border->remember);
+          e_remember_use(cfdata->border->remember);
      }
 
    if (cfdata->border->remember)
@@ -276,7 +281,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	else if (cfdata->mode == MODE_GEOMETRY_LOCKS)
 	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LOCKS;
 	else if (cfdata->mode == MODE_ALL)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LAYER | E_REMEMBER_APPLY_LOCKS | E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_STICKY | E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE | E_REMEMBER_APPLY_SKIP_WINLIST;
+	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LAYER | 
+					    E_REMEMBER_APPLY_LOCKS | E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_STICKY | 
+					    E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE | 
+					    E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR;
 	cfdata->border->remember->apply_first_only = 0;
        e_remember_update(cfdata->border->remember, cfdata->border);
      }
@@ -295,6 +303,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	 (cfdata->remember.apply_border) || (cfdata->remember.apply_sticky) ||
 	 (cfdata->remember.apply_desktop) || (cfdata->remember.apply_shade) ||
 	 (cfdata->remember.apply_zone) || (cfdata->remember.apply_skip_winlist) ||
+	 (cfdata->remember.apply_skip_pager) || (cfdata->remember.apply_skip_taskbar) ||
 	 (cfdata->remember.apply_run) || (cfdata->remember.apply_icon_pref) ||
 	 (cfdata->remember.set_focus_on_start)))
      {
@@ -403,6 +412,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	if (cfdata->remember.apply_shade) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SHADE;
 	if (cfdata->remember.apply_zone) cfdata->border->remember->apply |= E_REMEMBER_APPLY_ZONE;
 	if (cfdata->remember.apply_skip_winlist) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_WINLIST;
+	if (cfdata->remember.apply_skip_pager) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
+	if (cfdata->remember.apply_skip_taskbar) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_TASKBAR;
 	if (cfdata->remember.apply_run) cfdata->border->remember->apply |= E_REMEMBER_APPLY_RUN;
 	if (cfdata->remember.apply_icon_pref) cfdata->border->remember->apply |= E_REMEMBER_APPLY_ICON_PREF;
 	if (cfdata->remember.set_focus_on_start) cfdata->border->remember->apply |= E_REMEMBER_SET_FOCUS_ON_START;
@@ -506,15 +517,19 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_check_add(evas, _("Icon Preference"), &(cfdata->remember.apply_icon_pref));
    e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Stickiness"), &(cfdata->remember.apply_sticky));
-   e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Virtual Desktop"), &(cfdata->remember.apply_desktop));
-   e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Shaded state"), &(cfdata->remember.apply_shade));
-   e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Current Screen"), &(cfdata->remember.apply_zone));
-   e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Skip Window List"), &(cfdata->remember.apply_skip_winlist));
+   e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
+   ob = e_widget_check_add(evas, _("Skip Pager"), &(cfdata->remember.apply_skip_pager));
    e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
+   ob = e_widget_check_add(evas, _("Skip Taskbar"), &(cfdata->remember.apply_skip_taskbar));
+   e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    
    ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only));
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 5de9237..65ae7aa 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -34,7 +34,8 @@ struct _E_Config_Dialog_Data
 
 /* Key pairs for module types 
  * 
- * Should be in alphabetic order */
+ * Should be in alphabetic order 
+*/
 const CFTypes _types[] = 
 {
      {"appearance", N_("Appearance")},
@@ -55,16 +56,16 @@ static Evas_Object *_basic_create         (E_Config_Dialog *cfd, Evas *evas,
 static void         _fill_type_hash       (void);
 static void         _load_modules         (const char *dir);
 static void         _fill_list            (Evas_Object *obj, int enabled);
-static Evas_Bool    _types_hash_cb_free   (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _types_hash_cb_free   (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata __UNUSED__);
-static Evas_Bool    _mod_hash_cb_free     (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_cb_free     (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata __UNUSED__);
-static Evas_Bool    _mod_hash_avail_list  (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_avail_list  (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata);
-static Evas_Bool    _mod_hash_load_list   (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_load_list   (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata);
 static int          _mod_list_sort        (void *data1, void *data2);
@@ -72,16 +73,16 @@ static void         _list_widget_load     (Evas_Object *obj, Evas_List *list);
 static void         _avail_list_cb_change (void *data, Evas_Object *obj);
 static void         _load_list_cb_change  (void *data, Evas_Object *obj);
 static void         _unselect_all_modules (void);
-static Evas_Bool    _mod_hash_unselect    (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_unselect    (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata __UNUSED__);
 static void         _select_all_modules   (Evas_Object *obj, void *data);
 static void         _btn_cb_unload        (void *data, void *data2);
 static void         _btn_cb_load          (void *data, void *data2);
-static Evas_Bool    _mod_hash_load        (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_load        (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata __UNUSED__);
-static Evas_Bool    _mod_hash_unload      (Evas_Hash *hash __UNUSED__, 
+static Evas_Bool    _mod_hash_unload      (const Evas_Hash *hash __UNUSED__, 
 					   const char *key __UNUSED__, 
 					   void *data, void *fdata __UNUSED__);
 static void         _enable_modules       (int enable);
@@ -119,6 +120,7 @@ _create_data(E_Config_Dialog *cfd)
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    if (!cfdata) return NULL;
+
    _fill_data(cfdata);
    return cfdata;
 }
@@ -136,8 +138,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
      {
 	E_Path_Dir *epd = NULL;
 
-	epd = l->data;
-	if (!epd) continue;
+	if (!(epd = l->data)) continue;
 	if (!ecore_file_is_dir(epd->dir)) continue;
 	_load_modules(epd->dir);
      }
@@ -229,8 +230,7 @@ _load_modules(const char *dir)
    char *mod = NULL;
 
    if (!dir) return;
-   files = ecore_file_ls(dir);
-   if (!files) return;
+   if (!(files = ecore_file_ls(dir))) return;
 
    /* get all modules in this path_dir */
    ecore_list_first_goto(files);
@@ -245,8 +245,7 @@ _load_modules(const char *dir)
 	/* check that we have a desktop file for this module */
 	snprintf(buf, sizeof(buf), "%s/%s/module.desktop", dir, mod);
 	if (!ecore_file_exists(buf)) continue;
-	desk = efreet_desktop_get(buf);
-	if (!desk) continue;
+	if (!(desk = efreet_desktop_get(buf))) continue;
 
 	/* does the ModuleType exist in desktop? */
 	if (desk->x) 
@@ -308,8 +307,7 @@ _fill_list(Evas_Object *obj, int enabled)
 	     int count = 0;
 
 	     if (!_types[i].key) continue;
-	     cft = evas_hash_find(types_hash, _types[i].key);
-	     if (!cft) continue;
+	     if (!(cft = evas_hash_find(types_hash, _types[i].key))) continue;
 	     if (cft->modules)
 	       {
 		  if (!enabled)
@@ -324,6 +322,7 @@ _fill_list(Evas_Object *obj, int enabled)
 		  if (l) evas_list_free(l);
 		  continue;
 	       }
+
 	     /* We have at least one, append header */
 	     e_widget_ilist_header_append(obj, NULL, cft->name);
 
@@ -346,13 +345,12 @@ _fill_list(Evas_Object *obj, int enabled)
 }
 
 static Evas_Bool 
-_types_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		    void *data, void *fdata __UNUSED__) 
 {
    CFType *type = NULL;
 
-   type = data;
-   if (!type) return 1;
+   if (!(type = data)) return 1;
    if (type->key) evas_stringshare_del(type->key);
    if (type->name) evas_stringshare_del(type->name);
    if (type->modules) 
@@ -366,13 +364,12 @@ _types_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
 }
 
 static Evas_Bool 
-_mod_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		  void *data, void *fdata __UNUSED__) 
 {
    CFModule *mod = NULL;
 
-   mod = data;
-   if (!mod) return 1;
+   if (!(mod = data)) return 1;
    if (mod->short_name) evas_stringshare_del(mod->short_name);
    if (mod->name) evas_stringshare_del(mod->name);
    if (mod->icon) evas_stringshare_del(mod->icon);
@@ -383,7 +380,7 @@ _mod_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
 }
 
 static Evas_Bool 
-_mod_hash_avail_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		     void *data, void *fdata) 
 {
    Evas_List **l;
@@ -397,7 +394,7 @@ _mod_hash_avail_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
 }
 
 static Evas_Bool 
-_mod_hash_load_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		    void *data, void *fdata) 
 {
    Evas_List **l;
@@ -436,8 +433,7 @@ _list_widget_load(Evas_Object *obj, Evas_List *list)
 	char *path;
 	char buf[4096];
 
-	mod = ml->data;
-	if (!mod) continue;
+	if (!(mod = ml->data)) continue;
 	if (mod->orig_path) 
 	  {
 	     path = ecore_file_dir_get(mod->orig_path);
@@ -458,8 +454,7 @@ _avail_list_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata = NULL;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
 
    /* Unselect all in loaded list & disable buttons */
    e_widget_ilist_unselect(cfdata->l_loaded);
@@ -484,8 +479,7 @@ _load_list_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata = NULL;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
 
    /* Unselect all in avail list & disable button */
    e_widget_ilist_unselect(cfdata->l_avail);
@@ -525,13 +519,12 @@ _unselect_all_modules(void)
 }
 
 static Evas_Bool 
-_mod_hash_unselect(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		   void *data, void *fdata __UNUSED__) 
 {
    CFModule *mod = NULL;
 
-   mod = data;
-   if (!mod) return 1;
+   if (!(mod = data)) return 1;
    mod->selected = 0;
    return 1;
 }
@@ -543,8 +536,7 @@ _select_all_modules(Evas_Object *obj, void *data)
    E_Config_Dialog_Data *cfdata = NULL;
    int i = 0;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
    for (i = 0, l = e_widget_ilist_items_get(obj); l; l = l->next, i++) 
      {
 	E_Ilist_Item *item = NULL;
@@ -552,8 +544,7 @@ _select_all_modules(Evas_Object *obj, void *data)
 
 	item = l->data;
 	if ((!item) || (!item->selected)) continue;
-	mod = e_widget_ilist_nth_data_get(obj, i);
-	if (!mod) continue;
+	if (!(mod = e_widget_ilist_nth_data_get(obj, i))) continue;
 	mod->selected = 1;
 	if (mod->comment)
 	  e_widget_textblock_markup_set(cfdata->o_desc, mod->comment);
@@ -568,30 +559,50 @@ static void
 _btn_cb_unload(void *data, void *data2) 
 {
    E_Config_Dialog_Data *cfdata = NULL;
+   int sel = -1;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
+
+   /* get what is currently selected in the list */
+   sel = e_widget_ilist_selected_get(cfdata->l_loaded);
 
    _enable_modules(0);
    e_widget_disabled_set(cfdata->b_unload, 1);
    e_widget_textblock_markup_set(cfdata->o_desc, _("Description: Unavailable"));
+
+   /* using a total reload here as it's simpler than parsing the list(s), 
+    * finding what was selected, removing it, checking for headers, etc */
    _fill_list(cfdata->l_avail, 0);
    _fill_list(cfdata->l_loaded, 1);
+
+   /* move the selection down one if possible. Ilist itself will check 
+    * for headers, etc, etc */
+   e_widget_ilist_selected_set(cfdata->l_loaded, sel);
 }
 
 static void 
 _btn_cb_load(void *data, void *data2) 
 {
    E_Config_Dialog_Data *cfdata = NULL;
+   int sel = -1;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
+
+   /* get what is currently selected in the list */
+   sel = e_widget_ilist_selected_get(cfdata->l_avail);
 
    _enable_modules(1);
    e_widget_disabled_set(cfdata->b_load, 1);
    e_widget_textblock_markup_set(cfdata->o_desc, _("Description: Unavailable"));
+
+   /* using a total reload here as it's simpler than parsing the list(s), 
+    * finding what was selected, removing it, checking for headers, etc */
    _fill_list(cfdata->l_avail, 0);
    _fill_list(cfdata->l_loaded, 1);
+
+   /* move the selection down one if possible. Ilist itself will check 
+    * for headers, etc, etc */
+   e_widget_ilist_selected_set(cfdata->l_avail, sel);
 }
 
 static void 
@@ -617,7 +628,7 @@ _enable_modules(int enable)
 }
 
 static Evas_Bool 
-_mod_hash_load(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_load(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 	       void *data, void *fdata __UNUSED__) 
 {
    CFModule *mod = NULL;
@@ -634,7 +645,7 @@ _mod_hash_load(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
 }
 
 static Evas_Bool 
-_mod_hash_unload(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
+_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, 
 		 void *data, void *fdata __UNUSED__) 
 {
    CFModule *mod = NULL;
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index 50be1f3..314fa4b 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -204,14 +204,14 @@ _load_avail_gadgets(void *data)
      {
         E_Gadcon_Client_Class *cc;
         Evas_Object *icon = NULL;
-        char *lbl = NULL;
+        const char *lbl = NULL;
 
         if (!(cc = l->data)) continue;
         if (cc->func.label) lbl = cc->func.label();
         if (!lbl) lbl = cc->name;
         if (cc->func.icon) icon = cc->func.icon(evas);
         e_widget_ilist_append(cfdata->o_avail, icon, lbl, NULL, 
-                              cc->name, NULL);
+                              (void *)cc->name, NULL);
      }
    e_widget_ilist_go(cfdata->o_avail);
    e_widget_min_size_get(cfdata->o_avail, &w, NULL);
@@ -245,7 +245,7 @@ _load_sel_gadgets(void *data)
           {
              E_Gadcon_Client_Class *gcc;
              Evas_Object *icon = NULL;
-             char *lbl = NULL;
+             const char *lbl = NULL;
 
              if (!(gcc = l2->data)) continue;
              if ((cgc->name) && (gcc->name) && 
@@ -255,7 +255,7 @@ _load_sel_gadgets(void *data)
                   if (!lbl) lbl = gcc->name;
                   if (gcc->func.icon) icon = gcc->func.icon(evas);
                   e_widget_ilist_append(cfdata->o_sel, icon, lbl, NULL, 
-                                        gcc->name, NULL);
+                                        (void *)gcc->name, NULL);
                }
           }
      }
@@ -369,7 +369,7 @@ static int
 _gad_list_sort(void *data1, void *data2) 
 {
    E_Gadcon_Client_Class *cc, *cc2;
-   char *lbl1 = NULL, *lbl2 = NULL;
+   const char *lbl1 = NULL, *lbl2 = NULL;
 
    if (!(cc = data1)) return 1;
    if (!(cc2 = data2)) return -1;
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 2683657..b89dad4 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -83,8 +83,8 @@ e_int_menus_main_new(void)
    E_Menu *m, *subm;
    E_Menu_Item *mi;
    Main_Data *dat;
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    dat = calloc(1, sizeof(Main_Data));
    m = e_menu_new();
    e_menu_title_set(m, _("Main"));
@@ -109,7 +109,7 @@ e_int_menus_main_new(void)
 	     e_menu_item_submenu_set(mi, subm);
 	  }
      }
-   
+
    if (e_config->menu_apps_show) 
      {
 	subm = e_int_menus_all_apps_new();
@@ -119,7 +119,7 @@ e_int_menus_main_new(void)
 	e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
 	e_menu_item_submenu_set(mi, subm);
      }
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "main/1");
    if (l) _e_int_menus_augmentation_add(m, l);
 
@@ -135,7 +135,7 @@ e_int_menus_main_new(void)
    e_menu_item_label_set(mi, _("Desktop"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
    e_menu_item_submenu_set(mi, subm);
-  
+
    subm = e_int_menus_clients_new();
    e_object_data_set(E_OBJECT(subm), dat);   
    dat->clients = subm;
@@ -179,13 +179,13 @@ e_int_menus_main_new(void)
    e_menu_item_label_set(mi, _("Theme"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
    e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "main/5");
    if (l) _e_int_menus_augmentation_add(m, l);
 
    mi = e_menu_item_new(subm);
    e_menu_item_separator_set(mi, 1);
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "main/6");
    if (l) _e_int_menus_augmentation_add(m, l);
 
@@ -241,7 +241,7 @@ EAPI E_Menu *
 e_int_menus_apps_new(const char *dir)
 {
    E_Menu *m;
- 
+
    m = e_menu_new();
    if (dir) e_object_data_set(E_OBJECT(m), strdup(dir));
    e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL);
@@ -255,9 +255,9 @@ e_int_menus_desktops_new(void)
 {
    E_Menu *m, *subm;
    E_Menu_Item *mi;
-   
+
    m = e_menu_new();
-   
+
    subm = e_menu_new();
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Virtual"));
@@ -276,7 +276,7 @@ e_int_menus_desktops_new(void)
 
    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, _("Show/Hide All Windows"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/showhide");
@@ -290,14 +290,14 @@ EAPI E_Menu *
 e_int_menus_favorite_apps_new(void)
 {
    E_Menu *m = NULL;
-   char buf[4096];
+   char buf[PATH_MAX];
    const char *homedir;
-   
+
    homedir = e_user_homedir_get();
-   snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu", homedir);
+   snprintf(buf, sizeof(buf), 
+            "%s/.e/e/applications/menu/favorite.menu", homedir);
 
-   if (ecore_file_exists(buf)) 
-     m = e_int_menus_apps_new(buf);
+   if (ecore_file_exists(buf)) m = e_int_menus_apps_new(buf);
    return m;
 }
 
@@ -305,6 +305,7 @@ EAPI E_Menu *
 e_int_menus_all_apps_new(void)
 {
    E_Menu *m;
+
    m = e_int_menus_apps_new(NULL);
    return m;
 }
@@ -313,10 +314,9 @@ EAPI E_Menu *
 e_int_menus_config_new(void)
 {
    E_Menu *m;
-   
+
    m = e_menu_new();
    e_menu_pre_activate_callback_set(m, _e_int_menus_config_pre_cb, NULL);
-
    return m;
 }
 
@@ -344,7 +344,7 @@ EAPI E_Menu *
 e_int_menus_sys_new(void)
 {
    E_Menu *m;
-   
+
    m = e_menu_new();
    e_menu_pre_activate_callback_set(m, _e_int_menus_sys_pre_cb, NULL);
    return m;
@@ -358,7 +358,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
 				  void *data_del)
 {
    E_Int_Menu_Augmentation *maug;
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    maug = E_NEW(E_Int_Menu_Augmentation, 1);
    if (!maug) return NULL;
@@ -371,10 +371,14 @@ e_int_menus_menu_augmentation_add(const char *menu,
 
    l = evas_hash_find(_e_int_menus_augmentation, menu);
    if (l) 
-     _e_int_menus_augmentation = evas_hash_del(_e_int_menus_augmentation, menu, l);
+     {
+        _e_int_menus_augmentation = 
+          evas_hash_del(_e_int_menus_augmentation, menu, l);
+     }
 
    l = evas_list_append(l, maug);
-   _e_int_menus_augmentation = evas_hash_add(_e_int_menus_augmentation, menu, l);
+   _e_int_menus_augmentation = 
+     evas_hash_add(_e_int_menus_augmentation, menu, l);
 
    return maug;
 }
@@ -382,7 +386,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
 EAPI void
 e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    l = evas_hash_find(_e_int_menus_augmentation, menu);
    if (l)
@@ -391,13 +395,15 @@ e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *mau
 	 * We should always add the list to the hash, in case the list
 	 * becomes empty, or the first element is removed.
 	 */
-	_e_int_menus_augmentation = evas_hash_del(_e_int_menus_augmentation, 
-						  menu, l);
+	_e_int_menus_augmentation = 
+          evas_hash_del(_e_int_menus_augmentation, menu, l);
 
 	l = evas_list_remove(l, maug);
-	if (l)
-	  _e_int_menus_augmentation = evas_hash_add(_e_int_menus_augmentation, 
-						    menu, l);
+	if (l) 
+          {
+             _e_int_menus_augmentation = 
+               evas_hash_add(_e_int_menus_augmentation, menu, l);
+          }
      }
    free(maug);
 }
@@ -408,7 +414,7 @@ _e_int_menus_main_del_hook(void *obj)
 {
    Main_Data *dat;
    E_Menu *m;
-   
+
    m = obj;
    dat = e_object_data_get(E_OBJECT(obj));
    if (dat)
@@ -441,7 +447,7 @@ static void
 _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_About *about;
-   
+
    about = e_about_new(e_container_current_get(e_manager_current_get()));
    if (about) e_about_show(about);
 }
@@ -450,7 +456,7 @@ static void
 _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Theme_About *about;
-   
+
    about = e_theme_about_new(e_container_current_get(e_manager_current_get()));
    if (about) e_theme_about_show(about);
 }
@@ -485,7 +491,7 @@ static void
 _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *act;
-   
+
    act = e_action_find("desk_deskshow_toggle");
    if (act) act->func.go(E_OBJECT(m->zone), NULL);
 }
@@ -494,7 +500,7 @@ static void
 _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("restart");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -503,7 +509,7 @@ static void
 _e_int_menus_main_logout(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("logout");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -512,7 +518,7 @@ static void
 _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("exit");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -521,7 +527,7 @@ static void
 _e_int_menus_main_halt(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("halt");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -530,7 +536,7 @@ static void
 _e_int_menus_main_reboot(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("reboot");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -539,7 +545,7 @@ static void
 _e_int_menus_main_suspend(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("suspend");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -548,7 +554,7 @@ static void
 _e_int_menus_main_hibernate(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *a;
-   
+
    a = e_action_find("hibernate");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
 }
@@ -561,14 +567,14 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
    if (menu->entries)
      {
 	Efreet_Menu *entry;
-	
+
         ecore_list_first_goto(menu->entries);
 	while ((entry = ecore_list_next(menu->entries)))
 	  {
 	     mi = e_menu_item_new(m);
-	     
+
 	     _e_int_menus_item_label_set(entry, mi);
-	     
+
 	     if (entry->icon)
 	       {
 		  if (entry->icon[0] == '/')
@@ -577,7 +583,8 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
 		    {
 		       char *file;
 
-		       file = efreet_icon_path_find(e_config->icon_theme, entry->icon, "24x24");
+		       file = efreet_icon_path_find(e_config->icon_theme, 
+                                                    entry->icon, "24x24");
 		       e_menu_item_icon_file_set(mi, file);
 		       E_FREE(file);
 		    }
@@ -586,16 +593,21 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
 	       e_menu_item_separator_set(mi, 1);
 	     else if (entry->type == EFREET_MENU_ENTRY_DESKTOP)
 	       {
-		  e_menu_item_callback_set(mi, _e_int_menus_apps_run, entry->desktop);
-		  e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag, entry->desktop);
+		  e_menu_item_callback_set(mi, _e_int_menus_apps_run, 
+                                           entry->desktop);
+		  e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag, 
+                                                entry->desktop);
 	       }
 	     else if (entry->type == EFREET_MENU_ENTRY_MENU)
 	       {
 		  E_Menu *subm;
 
 		  subm = e_menu_new();
-		  e_menu_pre_activate_callback_set(subm, _e_int_menus_apps_start, entry);
-		  e_object_del_attach_func_set(E_OBJECT(subm), _e_int_menus_items_del_hook);
+		  e_menu_pre_activate_callback_set(subm, 
+                                                   _e_int_menus_apps_start, 
+                                                   entry);
+		  e_object_del_attach_func_set(E_OBJECT(subm), 
+                                               _e_int_menus_items_del_hook);
 		  e_menu_item_submenu_set(mi, subm);
 	       }
 	     /* TODO: Highlight header
@@ -618,8 +630,8 @@ _e_int_menus_apps_start(void *data, E_Menu *m)
    menu = data;
    if (!menu)
      {
-	char *dir;
-	
+	char *dir = NULL;
+
 	dir = e_object_data_get(E_OBJECT(m));
 	if (dir)
 	  {
@@ -628,7 +640,8 @@ _e_int_menus_apps_start(void *data, E_Menu *m)
 	  }
 	else menu = efreet_menu_get();
 	e_object_data_set(E_OBJECT(m), menu);
-	e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_apps_free_hook2);
+	e_object_free_attach_func_set(E_OBJECT(m), 
+                                      _e_int_menus_apps_free_hook2);
      }
    if (menu) _e_int_menus_apps_scan(m, menu);
    e_menu_pre_activate_callback_set(m, NULL, NULL);
@@ -638,13 +651,13 @@ static void
 _e_int_menus_items_del_hook(void *obj)
 {
    E_Menu *m;
-   Evas_List *l;
-   
+   Evas_List *l = NULL;
+
    m = obj;
    for (l = m->items; l; l = l->next)
      {
 	E_Menu_Item *mi;
-	
+
 	mi = l->data;
 	if (mi->submenu) e_object_del(E_OBJECT(mi->submenu));
      }
@@ -655,7 +668,7 @@ _e_int_menus_apps_free_hook(void *obj)
 {
    E_Menu *m;
    char *dir;
-   
+
    m = obj;
    dir = e_object_data_get(E_OBJECT(m));
    E_FREE(dir);
@@ -666,7 +679,7 @@ _e_int_menus_apps_free_hook2(void *obj)
 {
    E_Menu *m;
    Efreet_Menu *menu;
-   
+
    m = obj;
    menu = e_object_data_get(E_OBJECT(m));
    if (menu) efreet_menu_free(menu);
@@ -676,7 +689,7 @@ static void
 _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    Efreet_Desktop *desktop;
-   
+
    desktop = data;
    e_exec(m->zone, desktop, NULL, NULL, "menu/apps");
 }
@@ -685,7 +698,7 @@ static void
 _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    Efreet_Desktop *desktop;
-   
+
    desktop = data;
 
    /* start drag! */
@@ -714,20 +727,21 @@ _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
    E_Menu *root;
-   
+
    e_menu_pre_activate_callback_set(m, NULL, NULL);
-   
+
    root = e_menu_root_get(m);
    if ((root) && (root->zone))
      {
-	int i;
 	E_Zone *zone;
-	
+	int i;
+
 	zone = root->zone;
 	for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++)
 	  {
-	     E_Desk *desk = zone->desks[i];
-	
+	     E_Desk *desk;
+
+             desk = zone->desks[i];
 	     mi = e_menu_item_new(m);
 	     e_menu_item_radio_group_set(mi, 1);
 	     e_menu_item_radio_set(mi, 1);
@@ -773,10 +787,10 @@ static void
 _e_int_menus_config_pre_cb(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "config/0");
    if (l)
      {
@@ -794,10 +808,7 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m)
      }
 
    l = evas_hash_find(_e_int_menus_augmentation, "config/1");
-   if (l)
-     {
-	_e_int_menus_augmentation_add(m, l);
-     }
+   if (l) _e_int_menus_augmentation_add(m, l);
 
    l = evas_hash_find(_e_int_menus_augmentation, "config/2");
    if (l)
@@ -826,10 +837,10 @@ static void
 _e_int_menus_sys_pre_cb(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "sys/0");
    if (l)
      {
@@ -843,10 +854,10 @@ _e_int_menus_sys_pre_cb(void *data, E_Menu *m)
    e_menu_item_label_set(mi, _("Lock Screen"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/desklock_menu");
    e_menu_item_callback_set(mi, _e_int_menus_main_lock, NULL);
-   
+
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
-   
+
    if (e_sys_action_possible_get(E_SYS_HALT) ||
        e_sys_action_possible_get(E_SYS_REBOOT) ||
        e_sys_action_possible_get(E_SYS_SUSPEND) ||
@@ -883,12 +894,12 @@ _e_int_menus_sys_pre_cb(void *data, E_Menu *m)
 	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, _("Logout"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/logout");
    e_menu_item_callback_set(mi, _e_int_menus_main_logout, NULL);
-   
+
    l = evas_hash_find(_e_int_menus_augmentation, "sys/1");
    if (l)
      {
@@ -947,11 +958,11 @@ _e_int_menus_clients_group_class_cb(void *d1, void *d2)
    if (strcmp((const char*)bd1->client.icccm.class, 
 	      (const char*)bd2->client.icccm.class) > 0) 
      return 1;
-   
+
    if (strcmp((const char*)bd1->client.icccm.class, 
 	      (const char*)bd2->client.icccm.class) < 0) 
      return -1;
-   
+
    return -1;   /* Returning '-1' on equal is intentional */
 }
 
@@ -962,7 +973,7 @@ _e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
    E_Border *bd2;
    const char *name1;
    const char *name2;
-   
+
    if (!d1) return 1;
    if (!d2) return -1;
 
@@ -970,7 +981,7 @@ _e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
    bd2 = d2;
    name1 = e_border_name_get(bd1);
    name2 = e_border_name_get(bd2);
-   
+
    if (strcasecmp(name1, name2) > 0) return 1;
    if (strcasecmp(name1, name2) < 0) return -1;
    return 0;
@@ -979,8 +990,7 @@ _e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
 static int
 _e_int_menus_clients_sort_z_order_cb(void *d1, void *d2)
 {
-   E_Border *bd1;
-   E_Border *bd2;
+   E_Border *bd1, *bd2;
 
    if (!d1) return 1;
    if (!d2) return -1;
@@ -996,7 +1006,7 @@ _e_int_menus_clients_sort_z_order_cb(void *d1, void *d2)
 static void
 _e_int_menus_clients_menu_add_iconified(Evas_List *borders, E_Menu *m)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
    E_Menu_Item *mi;
 
    if (evas_list_count(borders) > 0)
@@ -1007,8 +1017,8 @@ _e_int_menus_clients_menu_add_iconified(Evas_List *borders, E_Menu *m)
 	for (l = borders; l; l = l->next)
 	  { 
 	     E_Border *bd; 
-	     bd = l->data; 
-	     
+
+	     bd = l->data;
 	     _e_int_menus_clients_item_create(bd, m);
 	  }
      }
@@ -1024,10 +1034,10 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
 
    class = strdup("");
    for (l = borders; l; l = l->next) 
-     { 
+     {
 	E_Border *bd; 
-	bd = l->data; 
 
+	bd = l->data; 
 	if ((bd->iconic) && 
 	    (e_config->clientlist_separate_iconified_apps == E_CLIENTLIST_GROUPICONS_SEP))
 	  { 
@@ -1040,8 +1050,7 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
 	  { 
 	     if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) 
 	       { 
-		  if (subm && mi) 
-		    e_menu_item_submenu_set(mi, subm); 
+		  if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm); 
 		  mi = e_menu_item_new(m); 
 		  e_menu_item_label_set(mi, bd->client.icccm.class); 
 		  e_util_menu_item_edje_icon_set(mi, "enlightenment/windows"); 
@@ -1061,7 +1070,7 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
      }
 
    if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) 
-       && subm && mi) 
+       && (subm) && (mi)) 
      e_menu_item_submenu_set(mi, subm);
 
    _e_int_menus_clients_menu_add_iconified(ico, m);
@@ -1079,7 +1088,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
    for (l = borders; l; l = l->next)
      {
 	E_Border *bd;
-	
+
 	bd = l->data; 
 	if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) 
 	  { 
@@ -1110,23 +1119,21 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
 	     mi = e_menu_item_new(m);
 	     e_menu_item_separator_set(mi, 1);
 	  }
-	
+
 	for (l = alt; l; l = l->next)
 	  { 
 	     E_Border *bd;
-	     
-	     bd = l->data; 
 
-	     if (bd->desk != desk && 
-		 e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)
+	     bd = l->data; 
+	     if ((bd->desk != desk) && 
+		 (e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE))
 	       {
 		  if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
 		    { 
-		       if (subm && mi) 
-			 e_menu_item_submenu_set(mi, subm); 
+		       if (subm && mi) e_menu_item_submenu_set(mi, subm); 
 		       mi = e_menu_item_new(m); 
 		       e_menu_item_label_set(mi, bd->desk->name); 
-		       e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops"); 
+		       e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
 		       subm = e_menu_new(); 
 		    }
 		  else
@@ -1142,10 +1149,10 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
 	       _e_int_menus_clients_item_create(bd, m);
 	  }
 	if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU 
-	    && subm && mi) 
+	    && (subm) && (mi)) 
 	  e_menu_item_submenu_set(mi, subm);
      }
-   
+
    _e_int_menus_clients_menu_add_iconified(ico, m);
 }
 
@@ -1153,13 +1160,14 @@ static void
 _e_int_menus_clients_add_by_none(Evas_List *borders, E_Menu *m)
 {
    Evas_List *l = NULL, *ico = NULL;
-   
+
    for (l = borders; l; l = l->next)
      {
 	E_Border *bd;
 
 	bd = l->data;
-	if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) 
+	if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) && 
+            (E_CLIENTLIST_GROUPICONS_SEP)) 
 	  { 
 	     ico = evas_list_append(ico, bd); 
 	     continue; 
@@ -1216,34 +1224,32 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
 	/* Sort the borders */
 	if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ALPHA)
           borders = evas_list_sort(borders, evas_list_count(borders), 
-                              _e_int_menus_clients_sort_alpha_cb);
+                                   _e_int_menus_clients_sort_alpha_cb);
 
 	if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ZORDER)
 	  borders = evas_list_sort(borders, evas_list_count(borders),
-		              _e_int_menus_clients_sort_z_order_cb);
+                                   _e_int_menus_clients_sort_z_order_cb);
 
 	/* Group the borders */
         if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_DESK)
 	  { 
              borders = evas_list_sort(borders, evas_list_count(borders), 
-                          _e_int_menus_clients_group_desk_cb);
+                                      _e_int_menus_clients_group_desk_cb);
              _e_int_menus_clients_add_by_desk(desk, borders, m);
 	  }
         if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_CLASS) 
 	  { 
 	     borders = evas_list_sort(borders, evas_list_count(borders), 
-		   _e_int_menus_clients_group_class_cb); 
+                                      _e_int_menus_clients_group_class_cb); 
 	     _e_int_menus_clients_add_by_class(borders, m);
 	  }
 	if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_NONE)
-	  {
-	     _e_int_menus_clients_add_by_none(borders, m);
-	  }
+          _e_int_menus_clients_add_by_none(borders, m);
      }
-   
+
    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, _("Cleanup Windows"));
    e_util_menu_item_edje_icon_set(mi, "enlightenment/windows");
@@ -1262,7 +1268,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
 	e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows");
 	e_menu_item_submenu_set(mi, subm);
      }
-   
+
    e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook);
    e_object_data_set(E_OBJECT(m), borders);
 }
@@ -1297,7 +1303,7 @@ _e_int_menus_clients_item_create(E_Border *bd, E_Menu *m)
 {
    E_Menu_Item *mi;
    const char *title;
-	
+
    title = _e_int_menus_clients_title_abbrv(e_border_name_get(bd));
    mi = e_menu_item_new(m);
    e_menu_item_check_set(mi, 1);
@@ -1317,14 +1323,14 @@ static void
 _e_int_menus_clients_free_hook(void *obj)
 {
    E_Menu *m;
-   Evas_List *borders;
-   
+   Evas_List *borders = NULL;
+
    m = obj;
    borders = e_object_data_get(E_OBJECT(m));
    while (borders)
      {
 	E_Border *bd;
-	
+
 	bd = borders->data;
 	borders = evas_list_remove_list(borders, borders);
 	e_object_unref(E_OBJECT(bd));
@@ -1335,7 +1341,7 @@ static void
 _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Border *bd;
-   
+
    bd = data;
    E_OBJECT_CHECK(bd);
 
@@ -1349,9 +1355,7 @@ _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
      }
 
    if (!bd->iconic) e_desk_show(bd->desk);
-
-   if (!bd->lock_user_stacking)
-     e_border_raise(bd);
+   if (!bd->lock_user_stacking) e_border_raise(bd);
    if (!bd->lock_focus_out)
      {
 	if (e_config->focus_policy != E_FOCUS_CLICK)
@@ -1366,7 +1370,7 @@ _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Border *bd;
    Evas_Object *o;
-   
+
    bd = data;
    E_OBJECT_CHECK(bd);
 
@@ -1379,7 +1383,7 @@ static void
 _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Action *act;
-   
+
    act = e_action_find("cleanup_windows");
    if (act) act->func.go(E_OBJECT(m->zone), NULL);
 }
@@ -1395,8 +1399,7 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    root = e_menu_root_get(m);
    /* get the current clients */
-   if (root)
-     zone = root->zone;
+   if (root) zone = root->zone;
    borders = e_border_lost_windows_get(zone);
 
    if (!borders)
@@ -1408,9 +1411,10 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
      }
    for (l = borders; l; l = l->next)
      {
-	E_Border *bd = l->data;
+	E_Border *bd; 
 	const char *title = "";
-	
+
+        bd = l->data;
 	title = e_border_name_get(bd);
 	mi = e_menu_item_new(m);
 	if ((title) && (title[0]))
@@ -1420,7 +1424,8 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
 	/* ref the border as we implicitly unref it in the callback */
 	e_object_ref(E_OBJECT(bd));
 	e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
-	if (bd->desktop) e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi);
+	if (bd->desktop) 
+          e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi);
      }
    e_object_free_attach_func_set(E_OBJECT(m), 
 				 _e_int_menus_lost_clients_free_hook);
@@ -1431,14 +1436,14 @@ static void
 _e_int_menus_lost_clients_free_hook(void *obj)
 {
    E_Menu *m;
-   Evas_List *borders;
-   
+   Evas_List *borders = NULL;
+
    m = obj;
    borders = e_object_data_get(E_OBJECT(m));
    while (borders)
      {
 	E_Border *bd;
-	
+
 	bd = borders->data;
 	borders = evas_list_remove_list(borders, borders);
 	e_object_unref(E_OBJECT(bd));
@@ -1462,31 +1467,28 @@ _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 static void
 _e_int_menus_augmentation_add(E_Menu *m, Evas_List *augmentation)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    for (l = augmentation; l; l = l->next)
      {
 	E_Int_Menu_Augmentation *aug;
 
 	aug = l->data;
-	if (aug->add.func)
-	  aug->add.func(aug->add.data, m);
+	if (aug->add.func) aug->add.func(aug->add.data, m);
      }
 }
 
 static void
 _e_int_menus_augmentation_del(E_Menu *m, Evas_List *augmentation)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
 
    for (l = augmentation; l; l = l->next)
      {
 	E_Int_Menu_Augmentation *aug;
 
 	aug = l->data;
-
-	if (aug->del.func)
-	  aug->del.func(aug->del.data, m);
+	if (aug->del.func) aug->del.func(aug->del.data, m);
      }
 }
 
@@ -1497,11 +1499,11 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
    Evas_List *l, *shelves = NULL;
    E_Container *con;
    E_Zone *zone;
-   
+
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    con = e_container_current_get(e_manager_current_get());
    zone = e_zone_current_get(con);
-   
+
    /* get the current clients */
    shelves = e_shelf_list();
 
@@ -1516,12 +1518,11 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
 	E_Shelf *s;
 	const char *name;
 	char buf[4096];
-	
-	s = l->data;
-	if (!s) continue;
+
+	if (!(s = l->data)) continue;
 	if (s->zone->num != zone->num) continue;
 	if (s->cfg->container != con->num) continue;
-	
+
 	name = s->name;
 	if (!name) name = _("Shelf #");	
 	snprintf(buf, sizeof(buf), "%s %i", name, s->id);
@@ -1574,7 +1575,7 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
      }
    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, _("Add A Shelf"));
    e_menu_item_callback_set(mi, _e_int_menus_shelves_add_cb, NULL);
@@ -1602,7 +1603,7 @@ _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    E_Container *con;
    E_Zone *zone;
    E_Config_Shelf *cs;
-   
+
    con = e_container_current_get(e_manager_current_get());
    zone = e_zone_current_get(con);
    cs = E_NEW(E_Config_Shelf, 1);
@@ -1619,7 +1620,7 @@ _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    cs->overlap = 0;
    e_config->shelves = evas_list_append(e_config->shelves, cs);
    e_config_save_queue();
-   
+
    e_shelf_config_init();
 }
 
@@ -1635,9 +1636,9 @@ _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
    Efreet_Desktop *desktop;
    char label[4096];
    int opt = 0;
-   
+
    if ((!entry) || (!mi)) return;
-   
+
    desktop = entry->desktop;
    if ((e_config->menu_eap_name_show) && (entry->name)) opt |= 0x4;
    if (desktop) 
@@ -1647,23 +1648,26 @@ _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
 	if ((e_config->menu_eap_comment_show) && (desktop->comment))
 	  opt |= 0x1;
      }
-   
+
    if (opt == 0x7) 
-     snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name, desktop->generic_name, desktop->comment);
+     snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name, 
+              desktop->generic_name, desktop->comment);
    else if (opt == 0x6) 
-     snprintf(label, sizeof(label), "%s (%s)", entry->name, desktop->generic_name);
+     snprintf(label, sizeof(label), "%s (%s)", entry->name, 
+              desktop->generic_name);
    else if (opt == 0x5) 
      snprintf(label, sizeof(label), "%s [%s]", entry->name, desktop->comment);
    else if (opt == 0x4) 
      snprintf(label, sizeof(label), "%s", entry->name);
    else if (opt == 0x3) 
-     snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name, desktop->comment);
+     snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name, 
+              desktop->comment);
    else if (opt == 0x2) 
      snprintf(label, sizeof(label), "%s", desktop->generic_name);
    else if (opt == 0x1) 
      snprintf(label, sizeof(label), "%s", desktop->comment);
    else
      snprintf(label, sizeof(label), "%s", entry->name);
-   
+
    e_menu_item_label_set(mi, label);
 }
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index b796dc3..aff1bb9 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -47,7 +47,7 @@ static Evas_List	*_e_intl_locale_system_locales_get(void);
 static Evas_List	*_e_intl_locale_search_order_get(const char *locale);
 static int		 _e_intl_locale_validate(const char *locale);
 static void 		 _e_intl_locale_hash_free(Evas_Hash *language_hash);
-static Evas_Bool 	 _e_intl_locale_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool 	 _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 
 /* Input Method Configuration and Management */
 static int 		 _e_intl_cb_exit(void *data, int type, void *event);
@@ -451,7 +451,7 @@ _e_intl_locale_hash_free(Evas_Hash *locale_hash)
 }
 
 static Evas_Bool
-_e_intl_locale_hash_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    free(data);
    return 1;
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index 71bd9be..0ad85c8 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -14,7 +14,7 @@ static int _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev
 static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
 static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
 
-static Evas_Bool _e_manager_frame_extents_free_cb(Evas_Hash *hash __UNUSED__,
+static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__,
 						  const char *key __UNUSED__,
 						  void *data, void *fdata __UNUSED__);
 #if 0 /* use later - maybe */
@@ -776,7 +776,7 @@ _e_manager_cb_screensaver_notify(void *data, int ev_type __UNUSED__, void *ev)
 }
 
 static Evas_Bool
-_e_manager_frame_extents_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
+_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
 				 void *data, void *fdata __UNUSED__)
 {
    free(data);
diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index fbf8c87..2d9e382 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -180,7 +180,7 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2,
    bl = e_container_border_list_first(bd->zone->container);
    while ((bd2 = e_container_border_list_next(bl)))
      {
-	if ((bd2->zone != bd->zone) || (bd == bd2) || (bd2->desk != bd->desk))
+	if ((bd2->zone != bd->zone) || (bd == bd2) || (bd2->desk != bd->desk && !bd2->sticky) || (bd2->iconic))
 	  continue;
 	OBSTACLE(bd2->x, bd2->y, bd2->x + bd2->w, bd2->y + bd2->h);
      }
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 5c0cae4..b9b0118 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -86,7 +86,7 @@ static int  _e_menu_cb_scroll_animator            (void *data);
 static int  _e_menu_cb_window_shape               (void *data, int ev_type, void *ev);
 
 static void _e_menu_cb_item_submenu_post_default  (void *data, E_Menu *m, E_Menu_Item *mi);
-static Evas_Bool _e_menu_categories_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 
 /* local subsystem globals */
 static Ecore_X_Window       _e_menu_win                 = 0;
@@ -1421,7 +1421,15 @@ _e_menu_realize(E_Menu *m)
    evas_object_show(o);
 
    if (m->shaped)
-     ecore_evas_shaped_set(m->ecore_evas, m->shaped);
+     {       
+	if (e_config->use_composite)
+	  {
+	     ecore_evas_alpha_set(m->ecore_evas, m->shaped);
+	     m->evas_win = ecore_evas_software_x11_window_get(m->ecore_evas);
+	  }
+	else
+	  ecore_evas_shaped_set(m->ecore_evas, m->shaped);
+     }
    
    o = e_box_add(m->evas);
    m->container_object = o;
@@ -2867,7 +2875,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
 
 
 static Evas_Bool
-_e_menu_categories_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    Evas_List *l;
    E_Menu_Category *cat;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 40f31ec..db69819 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -43,7 +43,19 @@ e_module_shutdown(void)
     */
    VALGRIND_DO_LEAK_CHECK
 #endif
-
+     
+   for (l = _e_modules; l; l = l->next)
+     {
+	E_Module *m;
+	
+	m = l->data;
+	if ((m->enabled) && (!m->error))
+	  {
+	     m->func.save(m);
+	     m->func.shutdown(m);
+	     m->enabled = 0;
+	  }
+     }
    l = _e_modules;
    _e_modules = NULL;
    while (l)
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 5c57a70..b48123b 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -288,7 +288,7 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    DBusMessage *reply;
-   char *profile; 
+   const char *profile;
 
    profile = e_config_profile_get();
 
diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c
index 6b9e13f..7dd946f 100644
--- a/src/bin/e_pan.c
+++ b/src/bin/e_pan.c
@@ -230,7 +230,7 @@ _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 }
 
 static void
-_e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
+_e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
    evas_object_clip_set(sd->child_obj, clip);
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 68bd28a..abf5301 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -6,7 +6,7 @@
 /* local subsystem functions */
 static void      _e_path_free(E_Path *ep);
 static void      _e_path_cache_free(E_Path *ep);
-static Evas_Bool _e_path_cache_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 
 /* externally accessible functions */
 EAPI E_Path *
@@ -387,7 +387,7 @@ _e_path_cache_free(E_Path *ep)
 }
 
 static Evas_Bool
-_e_path_cache_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    evas_stringshare_del(data);
    return 1;
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 6e48f75..e6e1ef2 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -490,6 +490,7 @@ _e_pointer_active_handle(E_Pointer *p)
 	  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 scedule a pre-idle check in 1 second if no more events happen */
    p->idle_timer = ecore_timer_add(1.0, _e_pointer_cb_idle_timer_pre, p);
 }
@@ -506,8 +507,11 @@ _e_pointer_cb_mouse_down(void *data, int type, void *event)
      {
 	p = l->data;
 	_e_pointer_active_handle(p);
-	if (p->pointer_object)
-	  edje_object_signal_emit(p->pointer_object, "e,action,mouse,down", "e");
+	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 1;
 }
@@ -524,8 +528,11 @@ _e_pointer_cb_mouse_up(void *data, int type, void *event)
      {
 	p = l->data;
 	_e_pointer_active_handle(p);
-	if (p->pointer_object)
-	  edje_object_signal_emit(p->pointer_object, "e,action,mouse,up", "e");
+	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 1;
 }
@@ -542,8 +549,11 @@ _e_pointer_cb_mouse_move(void *data, int type, void *event)
      {
 	p = l->data;
 	_e_pointer_active_handle(p);
-	if (p->pointer_object)
-	  edje_object_signal_emit(p->pointer_object, "e,action,mouse,move", "e");
+	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 1;
 }
@@ -560,8 +570,11 @@ _e_pointer_cb_mouse_wheel(void *data, int type, void *event)
      {
 	p = l->data;
 	_e_pointer_active_handle(p);
-	if (p->pointer_object)
-	  edje_object_signal_emit(p->pointer_object, "e,action,mouse,wheel", "e");
+	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 1;
 }
@@ -586,6 +599,14 @@ _e_pointer_cb_idle_timer_wait(void *data)
    E_Pointer *p;
 
    p = data;
+   if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM)
+     {
+	if (p->idle_poller)
+	  ecore_poller_del(p->idle_poller);
+	p->idle_poller = NULL;
+	p->idle_timer = NULL;
+	return 0;
+     }
    if (!p->idle_poller)
      p->idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 64,
 				       _e_pointer_cb_idle_poller, p);
@@ -600,6 +621,11 @@ _e_pointer_cb_idle_poller(void *data)
    int x, y;
    
    p = data;
+   if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM)
+     {
+	p->idle_poller = NULL;
+	return 0;
+     }
    /* 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);
diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c
index 4d5d725..78ce201 100644
--- a/src/bin/e_powersave.c
+++ b/src/bin/e_powersave.c
@@ -96,6 +96,8 @@ e_powersave_mode_set(E_Powersave_Mode mode)
 {
    if (mode < powersave_mode_min) mode = powersave_mode_min;
    else if (mode > powersave_mode_max) mode = powersave_mode_max;
+   if (powersave_mode == mode) return;
+   printf("CHANGE PW SAVE MODE TO %i / %i\n", (int)mode, E_POWERSAVE_MODE_EXTREME);
    powersave_mode = mode;
    _e_powersave_mode_eval();
 }
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 1cbf7cf..9c5caa6 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -19,9 +19,9 @@ static E_Remember  *_e_remember_find(E_Border *bd, int check_usable);
 EAPI int
 e_remember_init(E_Startup_Mode mode)
 {
-   Evas_List *l;
+   Evas_List *l = NULL;
    int not_updated = 0;
- 
+
    if (mode == E_STARTUP_START)
      {
 	for (l = e_config->remembers; l; l = l->next)
@@ -59,7 +59,8 @@ e_remember_init(E_Startup_Mode mode)
      }
 
    if (not_updated)
-     e_config->remembers = evas_list_sort(e_config->remembers, evas_list_count(e_config->remembers), _e_remember_sort_list);
+     e_config->remembers = evas_list_sort(e_config->remembers, -1, 
+                                          _e_remember_sort_list);
 #endif
    return 1;
 }
@@ -74,7 +75,7 @@ EAPI E_Remember *
 e_remember_new(void)
 {
    E_Remember *rem;
-   
+
    rem = E_NEW(E_Remember, 1);
    if (!rem) return NULL;
    e_config->remembers = evas_list_prepend(e_config->remembers, rem);
@@ -108,13 +109,13 @@ e_remember_del(E_Remember *rem)
    if (rem->delete_me) return;
    if (rem->used_count != 0)
      {
-	Evas_List *l;
-	
+	Evas_List *l = NULL;
+
 	rem->delete_me = 1;
 	for (l = e_border_client_list(); l; l = l->next)
 	  {
 	     E_Border *bd;
-	     
+
 	     bd = l->data;
 	     if (bd->remember == rem)
 	       {
@@ -127,18 +128,20 @@ e_remember_del(E_Remember *rem)
    _e_remember_free(rem);
 }
 
-EAPI E_Remember  *
+EAPI E_Remember *
 e_remember_find_usable(E_Border *bd)
 {
-   E_Remember * rem;
+   E_Remember *rem;
+
    rem = _e_remember_find(bd, 1);
    return rem;
 }
 
-EAPI E_Remember  *
+EAPI E_Remember *
 e_remember_find(E_Border *bd)
 {
-   E_Remember * rem;
+   E_Remember *rem;
+
    rem = _e_remember_find(bd, 0);
    return rem;
 }
@@ -161,16 +164,16 @@ e_remember_match_update(E_Remember *rem)
 	/* The number of matches for this remember has changed so we
 	 * need to remove from list and insert back into the appropriate
 	 * loction. */
-	Evas_List *l;
+	Evas_List *l = NULL;
 	E_Remember *r; 
+
 	rem->max_score = max_count;
 	e_config->remembers = evas_list_remove(e_config->remembers, rem);
 
 	for (l = e_config->remembers; l; l = l->next)
 	  {
 	     r = l->data;
-	     if (r->max_score <= rem->max_score)
-	       break;
+	     if (r->max_score <= rem->max_score) break;
 	  }
 
 	if (l)
@@ -220,7 +223,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
    rem->role = NULL;
    rem->prop.border = NULL;
    rem->prop.command = NULL;
-   
+
    if (bd->client.icccm.name)
      rem->name = evas_stringshare_add(bd->client.icccm.name);
    if (bd->client.icccm.class)
@@ -233,26 +236,26 @@ e_remember_update(E_Remember *rem, E_Border *bd)
      rem->role = evas_stringshare_add(bd->client.icccm.window_role);
 
    e_remember_match_update(rem);
-   
+
    rem->type = bd->client.netwm.type;
-   
+
    if (bd->client.icccm.transient_for != 0)
      rem->transient = 1;
    else
      rem->transient = 0;
-   
+
    rem->prop.pos_x = bd->x - bd->zone->x;
    rem->prop.pos_y = bd->y - bd->zone->y;
    rem->prop.res_x = bd->zone->w;
    rem->prop.res_y = bd->zone->h;
    rem->prop.pos_w = bd->client.w;
    rem->prop.pos_h = bd->client.h;
-   
+
    rem->prop.w = bd->client.w;
    rem->prop.h = bd->client.h;
-   
+
    rem->prop.layer = bd->layer;
-   
+
    rem->prop.lock_user_location = bd->lock_user_location;
    rem->prop.lock_client_location = bd->lock_client_location;
    rem->prop.lock_user_size = bd->lock_user_size;
@@ -281,27 +284,28 @@ e_remember_update(E_Remember *rem, E_Border *bd)
      rem->prop.border = evas_stringshare_add(bd->bordername);
 
    rem->prop.sticky = bd->sticky;
-   
+
    if (bd->shaded)
-     rem->prop.shaded = 100 + bd->shade.dir;
+     rem->prop.shaded = (100 + bd->shade.dir);
    else
-     rem->prop.shaded = 50 + bd->shade.dir;
-   
+     rem->prop.shaded = (50 + bd->shade.dir);
+
    rem->prop.skip_winlist = bd->user_skip_winlist;
+   rem->prop.skip_pager   = bd->client.netwm.state.skip_pager;
+   rem->prop.skip_taskbar = bd->client.netwm.state.skip_taskbar;
    rem->prop.icon_preference = bd->icon_preference;
 
    e_desk_xy_get(bd->desk, &rem->prop.desk_x, &rem->prop.desk_y);
-   
+
    rem->prop.zone = bd->zone->num;
-   
    rem->prop.head = bd->zone->container->manager->num;
-   
+
    if ((bd->client.icccm.command.argc > 0) &&
        (bd->client.icccm.command.argv))
      {
 	char buf[4096];
 	int i, j, k;
-	
+
 	buf[0] = 0;
 	k = 0;
 	for (i = 0; i < bd->client.icccm.command.argc; i++)
@@ -337,7 +341,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
 	done:
 	rem->prop.command = evas_stringshare_add(buf);
      }
-   
+
    e_config_save_queue();
 }
 
@@ -345,16 +349,16 @@ e_remember_update(E_Remember *rem, E_Border *bd)
 static E_Remember *
 _e_remember_find(E_Border *bd, int check_usable)
 {
+   Evas_List *l = NULL;
+
 #if REMEMBER_SIMPLE
-   Evas_List *l;
-   
    for (l = e_config->remembers; l; l = l->next)
      {
 	E_Remember *rem;
 	int required_matches;
 	int matches;
 	const char *title = "";
-	
+
 	rem = l->data;
 	matches = 0;
 	required_matches = 0;
@@ -364,10 +368,10 @@ _e_remember_find(E_Border *bd, int check_usable)
 	if (rem->match & E_REMEMBER_MATCH_ROLE) required_matches++;
 	if (rem->match & E_REMEMBER_MATCH_TYPE) required_matches++;
 	if (rem->match & E_REMEMBER_MATCH_TRANSIENT) required_matches++;
-	
+
 	if (bd->client.netwm.name) title = bd->client.netwm.name;
 	else title = bd->client.icccm.title;
-	
+
 	if ((rem->match & E_REMEMBER_MATCH_NAME) &&
 	    ((!e_util_strcmp(rem->name, bd->client.icccm.name)) ||
 	     (e_util_both_str_empty(rem->name, bd->client.icccm.name))))
@@ -397,8 +401,6 @@ _e_remember_find(E_Border *bd, int check_usable)
    return NULL;
 #endif
 #if REMEMBER_HIERARCHY
-   Evas_List *l;
-
    /* This search method finds the best possible match available and is
     * based on the fact that the list is sorted, with those remembers
     * with the most possible matches at the start of the list. This
@@ -406,44 +408,44 @@ _e_remember_find(E_Border *bd, int check_usable)
     * within the set of best possible matches. */
    for (l = e_config->remembers; l; l = l->next)
      {
-	 E_Remember *rem;
-	 const char *title = "";
-
-	 rem = l->data;
-	 if (check_usable && !e_remember_usable_get(rem))
-	   continue;
-
-	  if (bd->client.netwm.name) title = bd->client.netwm.name;
-	  else title = bd->client.icccm.title;
-
-	  /* For each type of match, check whether the match is
-	   * required, and if it is, check whether there's a match. If
-	   * it fails, then go to the next remember */
-	  if (rem->match & E_REMEMBER_MATCH_NAME &&
-		e_util_strcmp(rem->name, bd->client.icccm.name) &&
-		!e_util_both_str_empty(rem->name, bd->client.icccm.name))
-	    continue;
-	  if (rem->match & E_REMEMBER_MATCH_CLASS &&
-		e_util_strcmp(rem->class, bd->client.icccm.class) &&
-		!e_util_both_str_empty(rem->class, bd->client.icccm.class))
-	    continue;
-	  if (rem->match & E_REMEMBER_MATCH_TITLE &&
-		e_util_strcmp(rem->title, title) &&
-		!e_util_both_str_empty(rem->title, title))
-	    continue;
-	  if (rem->match & E_REMEMBER_MATCH_ROLE &&
-		e_util_strcmp(rem->role, bd->client.icccm.window_role) &&
-		!e_util_both_str_empty(rem->role, bd->client.icccm.window_role))
-	    continue;
-	  if (rem->match & E_REMEMBER_MATCH_TYPE &&
-		rem->type != bd->client.netwm.type)
-	    continue;
-	  if (rem->match & E_REMEMBER_MATCH_TRANSIENT &&
-		!(rem->transient && bd->client.icccm.transient_for != 0) &&
-		!(!rem->transient) && (bd->client.icccm.transient_for == 0))
-	    continue;
+        E_Remember *rem;
+        const char *title = "";
 
-	  return rem;
+        rem = l->data;
+        if ((check_usable) && (!e_remember_usable_get(rem)))
+          continue;
+
+        if (bd->client.netwm.name) title = bd->client.netwm.name;
+        else title = bd->client.icccm.title;
+
+        /* For each type of match, check whether the match is
+         * required, and if it is, check whether there's a match. If
+         * it fails, then go to the next remember */
+        if (rem->match & E_REMEMBER_MATCH_NAME &&
+            e_util_strcmp(rem->name, bd->client.icccm.name) &&
+            !e_util_both_str_empty(rem->name, bd->client.icccm.name))
+          continue;
+        if (rem->match & E_REMEMBER_MATCH_CLASS &&
+            e_util_strcmp(rem->class, bd->client.icccm.class) &&
+            !e_util_both_str_empty(rem->class, bd->client.icccm.class))
+          continue;
+        if (rem->match & E_REMEMBER_MATCH_TITLE &&
+            e_util_strcmp(rem->title, title) &&
+            !e_util_both_str_empty(rem->title, title))
+          continue;
+        if (rem->match & E_REMEMBER_MATCH_ROLE &&
+            e_util_strcmp(rem->role, bd->client.icccm.window_role) &&
+            !e_util_both_str_empty(rem->role, bd->client.icccm.window_role))
+          continue;
+        if (rem->match & E_REMEMBER_MATCH_TYPE &&
+            rem->type != bd->client.netwm.type)
+          continue;
+        if (rem->match & E_REMEMBER_MATCH_TRANSIENT &&
+            !(rem->transient && bd->client.icccm.transient_for != 0) &&
+            !(!rem->transient) && (bd->client.icccm.transient_for == 0))
+          continue;
+
+        return rem;
      }
 
    return NULL;
@@ -466,8 +468,8 @@ _e_remember_free(E_Remember *rem)
 static int 
 _e_remember_sort_list(void * d1, void * d2)
 {
-   E_Remember * r1, * r2;
-   
+   E_Remember *r1, *r2;
+
    r1 = d1;
    r2 = d2;
    if (r1->max_score >= r2->max_score)
diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h
index a4223da..6f950da 100644
--- a/src/bin/e_remember.h
+++ b/src/bin/e_remember.h
@@ -23,8 +23,10 @@ typedef struct _E_Remember E_Remember;
 #define E_REMEMBER_APPLY_ZONE (1 << 8)
 #define E_REMEMBER_APPLY_RUN (1 << 9)
 #define E_REMEMBER_APPLY_SKIP_WINLIST (1 << 10)
-#define E_REMEMBER_APPLY_ICON_PREF (1 << 11)
-#define E_REMEMBER_SET_FOCUS_ON_START (1 << 12)
+#define E_REMEMBER_APPLY_SKIP_PAGER (1 << 11)
+#define E_REMEMBER_APPLY_SKIP_TASKBAR (1 << 12)
+#define E_REMEMBER_APPLY_ICON_PREF (1 << 13)
+#define E_REMEMBER_SET_FOCUS_ON_START (1 << 14)
 
 #else
 #ifndef E_REMEMBER_H
@@ -81,6 +83,8 @@ struct _E_Remember
 	unsigned char sticky;
 	unsigned char shaded;
 	unsigned char skip_winlist;
+	unsigned char skip_pager;
+	unsigned char skip_taskbar;
 	unsigned char icon_preference;
       
 	int           desk_x, desk_y;
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index 13b28c9..fa72ea2 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -21,8 +21,6 @@ struct _E_Smart_Data
    E_Scrollframe_Policy hbar_flags, vbar_flags;
 
    struct {
-      unsigned char now : 1;
-      unsigned char dragged : 1;
       Evas_Coord x, y;
       Evas_Coord sx, sy;
       Evas_Coord dx, dy;
@@ -32,6 +30,12 @@ struct _E_Smart_Data
       } history[20];
       double anim_start;
       Ecore_Animator *momentum_animator;
+      Evas_Coord locked_x, locked_y;
+      unsigned char now : 1;
+      unsigned char dragged : 1;
+      unsigned char dir_x : 1;
+      unsigned char dir_y : 1;
+      unsigned char locked : 1;
    } down;
    
    struct {
@@ -52,6 +56,7 @@ struct _E_Smart_Data
    unsigned char hbar_visible : 1;
    unsigned char vbar_visible : 1;
    unsigned char extern_pan : 1;
+   unsigned char one_dir_at_a_time : 1;
 }; 
 
 /* local subsystem functions */
@@ -60,6 +65,7 @@ static void _e_smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_
 static void _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
 static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static int  _e_smart_momentum_animator(void *data);
 static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
@@ -329,6 +335,20 @@ e_scrollframe_edje_object_get(Evas_Object *obj)
    return sd->edje_obj;
 }
 
+EAPI void
+e_scrollframe_single_dir_set(Evas_Object *obj, Evas_Bool single_dir)
+{
+   API_ENTRY return;
+   sd->one_dir_at_a_time = single_dir;
+}
+
+EAPI Evas_Bool
+e_scrollframe_single_dir_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   return sd->one_dir_at_a_time;
+}
+
 /* local subsystem functions */
 static void
 _e_smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source)
@@ -418,13 +438,17 @@ _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	  }
 	if (ev->button == 1)
 	  {
+	     printf("down @ %3.3f\n", ecore_time_get());
 	     sd->down.now = 1;
 	     sd->down.dragged = 0;
+	     sd->down.dir_x = 0;
+	     sd->down.dir_y = 0;
 	     sd->down.x = ev->canvas.x;
 	     sd->down.y = ev->canvas.y;
 	     e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
 	     sd->down.sx = x;
 	     sd->down.sy = y;
+	     sd->down.locked = 0;
 	     memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20);
 	     sd->down.history[0].timestamp = ecore_time_get();
 	     sd->down.history[0].x = ev->canvas.x;
@@ -434,7 +458,7 @@ _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 }
 
 static int
-_e_cb_momentum_animator(void *data)
+_e_smart_momentum_animator(void *data)
 {
    E_Smart_Data *sd;
    double t, dt, p;
@@ -475,7 +499,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
      {
 	if (ev->button == 1)
 	  {
-	     
+	     printf("up @ %3.3f\n", ecore_time_get());
 	     x = ev->canvas.x - sd->down.x;
 	     y = ev->canvas.y - sd->down.y;
 	     if (sd->down.dragged)
@@ -510,7 +534,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 			   (vel > e_config->thumbscroll_momentum_threshhold))
 			 {
 			    if (!sd->down.momentum_animator)
-			      sd->down.momentum_animator = ecore_animator_add(_e_cb_momentum_animator, sd);
+			      sd->down.momentum_animator = ecore_animator_add(_e_smart_momentum_animator, sd);
 			    sd->down.dx = ((double)dx / at);
 			    sd->down.dy = ((double)dy / at);
 			    sd->down.anim_start = t;
@@ -519,6 +543,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 			    sd->down.sy = y;
 			 }
 		    }
+		  evas_event_feed_hold(e, 0, ev->timestamp, ev->data);
 	       }
 	     sd->down.dragged = 0;
 	     sd->down.now = 0;
@@ -546,17 +571,53 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	     sd->down.history[0].y = ev->cur.canvas.y;
 	     
 	     x = ev->cur.canvas.x - sd->down.x;
+	     if (x < 0) x = -x;
 	     y = ev->cur.canvas.y - sd->down.y;
+	     if (y < 0) y = -y;
+	     if ((sd->one_dir_at_a_time) && 
+		 (!sd->down.dir_x) && (!sd->down.dir_y))
+	       {
+		  if (x > y)
+		    {
+		       if (x > e_config->thumbscroll_threshhold)
+			 {
+			    sd->down.dir_x = 1;
+			    sd->down.dir_y = 0;
+			 }
+		    }
+		  else
+		    {
+		       if (y > e_config->thumbscroll_threshhold)
+			 {
+			    sd->down.dir_x = 0;
+			    sd->down.dir_y = 1;
+			 }
+		    }
+	       }
 	     if ((sd->down.dragged) ||
 		 (((x * x) + (y * y)) > 
 		  (e_config->thumbscroll_threshhold * 
 		   e_config->thumbscroll_threshhold)))
 	       {
+		  if (!sd->down.dragged)
+		    evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
 		  ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 		  sd->down.dragged = 1;
 	       }
 	     x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
 	     y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
+	     if ((sd->down.dir_x) || (sd->down.dir_y))
+	       {
+		  if (!sd->down.locked)
+		    {
+		       printf("lock dir to x%iy%i\n", sd->down.dir_x, sd->down.dir_y);
+		       sd->down.locked_x = x;
+		       sd->down.locked_y = y;
+		       sd->down.locked = 1;
+		    }
+		  if (sd->down.dir_x) y = sd->down.locked_y;
+		  else x = sd->down.locked_x;
+	       }
 	     e_scrollframe_child_pos_set(sd->smart_obj, x, y);
 	  }
      }
diff --git a/src/bin/e_scrollframe.h b/src/bin/e_scrollframe.h
index 848937e..c0394c7 100644
--- a/src/bin/e_scrollframe.h
+++ b/src/bin/e_scrollframe.h
@@ -30,6 +30,9 @@ EAPI void e_scrollframe_page_size_get           (Evas_Object *obj, Evas_Coord *x
 EAPI void e_scrollframe_policy_set              (Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar);
 EAPI void e_scrollframe_policy_get              (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar);
 EAPI Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj);
+EAPI void e_scrollframe_single_dir_set          (Evas_Object *obj, Evas_Bool single_dir);
+EAPI Evas_Bool e_scrollframe_single_dir_get     (Evas_Object *obj);
+
     
 #endif
 #endif
diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c
new file mode 100644
index 0000000..82d2d90
--- /dev/null
+++ b/src/bin/e_slidecore.c
@@ -0,0 +1,418 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+#define SMART_NAME "e_slidecore"
+#define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
+#define INTERNAL_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return;
+typedef struct _E_Smart_Data E_Smart_Data;
+typedef struct _E_Smart_Item E_Smart_Item;
+
+struct _E_Smart_Data
+{
+   Evas_Coord   x, y, w, h;
+
+   Evas_Object *smart_obj;
+   Evas_Object *event_obj;
+   Evas_Object *o1, *o2;
+   Evas_List *items;
+   double slide_time, slide_start;
+   Ecore_Animator *slide_animator;
+   Evas_Coord dist, pos, slide_pos, slide_start_pos;
+   int p1, p2, pn;
+   unsigned char down : 1;
+};
+
+struct _E_Smart_Item
+{
+   const char *label;
+   const char *icon;
+   void (*func) (void *data);
+   void *data;
+};
+
+/* local subsystem functions */
+static int _e_smart_cb_slide_animator(void *data);
+static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_reconfigure(E_Smart_Data *sd);
+static void _e_smart_add(Evas_Object *obj);
+static void _e_smart_del(Evas_Object *obj);
+static void _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static void _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+static void _e_smart_show(Evas_Object *obj);
+static void _e_smart_hide(Evas_Object *obj);
+static void _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
+static void _e_smart_clip_set(Evas_Object *obj, Evas_Object * clip);
+static void _e_smart_clip_unset(Evas_Object *obj);
+static void _e_smart_init(void);
+
+/* local subsystem globals */
+static Evas_Smart *_e_smart = NULL;
+
+/* externally accessible functions */
+EAPI Evas_Object *
+e_slidecore_add(Evas *evas)
+{
+   _e_smart_init();
+   return evas_object_smart_add(evas, _e_smart);
+}
+
+EAPI void
+e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist)
+{
+   API_ENTRY return;
+   if (dist < 1) dist = 1;
+   sd->dist = dist;
+   _e_smart_reconfigure(sd);
+}
+
+EAPI void
+e_slidecore_item_add(Evas_Object *obj, const char *label, const char *icon,  void (*func) (void *data), void *data)
+{
+   E_Smart_Item *it;
+
+   API_ENTRY return;
+   it = calloc(1, sizeof(E_Smart_Item));
+   if (!it) return;
+   if (label) it->label = evas_stringshare_add(label);
+   if (icon) it->icon = evas_stringshare_add(icon);
+   it->func = func;
+   it->data = data;
+   sd->items = evas_list_append(sd->items, it);
+   _e_smart_reconfigure(sd);
+}
+
+EAPI void
+e_slidecore_jump(Evas_Object *obj, int num)
+{
+   API_ENTRY return;
+
+   sd->slide_start_pos = sd->pos;
+   sd->slide_pos = num * sd->dist;
+   if (!sd->slide_animator)
+     sd->slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
+					     sd);
+   sd->slide_start = ecore_time_get();
+}
+
+EAPI void
+e_slidecore_slide_time_set(Evas_Object *obj, double t)
+{
+   API_ENTRY return;
+   sd->slide_time = t;
+}
+
+
+/* local subsystem functions */
+
+static int
+_e_smart_cb_slide_animator(void *data)
+{
+   E_Smart_Data *sd;
+   double t;
+
+   sd = data;
+   t = (ecore_time_get() - sd->slide_start) / sd->slide_time;
+   if (t > 1.0) t = 1.0;
+   t = 1.0 - t;
+   t = 1.0 - (t * t * t * t); /* more t's - more curve */
+   if (t > 1.0) t = 1.0;
+   sd->pos = sd->slide_start_pos + (t * (sd->slide_pos - sd->slide_start_pos));
+   _e_smart_reconfigure(sd);
+   
+   if (t >= 1.0)
+     {
+	sd->slide_animator = NULL;
+	return 0;
+     }
+   return 1;
+}
+
+static void
+_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if (ev->button == 1) sd->down = 1;
+   if (sd->slide_animator)
+     {
+	ecore_animator_del(sd->slide_animator);
+	sd->slide_animator = NULL;
+     }
+}
+
+static void
+_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if (ev->button == 1)
+     {
+	int gop = 0;
+	int n;
+	
+	sd->down = 0;
+	n = evas_list_count(sd->items);
+	
+	gop = sd->pos - (sd->p1 * sd->dist);
+	gop = ((gop / sd->dist) * sd->dist) + (sd->p1 * sd->dist);
+	sd->slide_start_pos = sd->pos;
+	sd->slide_pos = gop;
+	if (!sd->slide_animator)
+	  sd->slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
+						  sd);
+	sd->slide_start = ecore_time_get();
+     }
+}
+
+static void
+_e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if (!sd->down) return;
+   sd->pos += ev->cur.canvas.x - ev->prev.canvas.x;
+   _e_smart_reconfigure(sd);
+}
+
+static void
+_e_smart_reconfigure(E_Smart_Data *sd)
+{
+   Evas_Coord dp, pos;
+   int p1, p2, at, pl1, pl2, n;
+   int r, g, b, a;
+
+   evas_object_move(sd->event_obj, sd->x, sd->y);
+   evas_object_resize(sd->event_obj, sd->w, sd->h);
+
+   pos = sd->pos;
+   n = evas_list_count(sd->items);
+   while (pos < 0) pos += (sd->dist * n);
+   p1 = pos / sd->dist;
+   p2 = (pos + sd->dist) / sd->dist;
+   dp = pos - (p1 * sd->dist);
+   at = (dp * 255) / (sd->dist - 1);
+
+   while ((p1 < 0) || (p2 < 0))
+     {
+	p1 += n;
+	p2 += n;
+	at += 255;
+	dp += sd->dist;
+     }
+   if ((sd->p1 != p1) || (sd->p2 != p2) || (sd->pn != n))
+     {
+	E_Smart_Item *it1, *it2;
+
+	sd->pn = n;
+	if (n > 0)
+	  {
+	     sd->p1 = p1;
+	     sd->p2 = p2;
+	     if (sd->o1) evas_object_del(sd->o1);
+	     if (sd->o2) evas_object_del(sd->o2);
+	     sd->o1 = NULL;
+	     sd->o2 = NULL;
+	     pl1 = sd->p1 % n;
+	     pl2 = sd->p2 % n;
+	     it1 = evas_list_nth(sd->items, pl1);
+	     it2 = evas_list_nth(sd->items, pl2);
+	     if (it1 && it2)
+	       {
+		  sd->o1 =  e_util_icon_theme_icon_add(it1->icon, "512x512",
+						       evas_object_evas_get(sd->smart_obj));
+		  if (sd->o1)
+		    {
+		       e_icon_scale_size_set(sd->o1, 0);
+		       evas_object_stack_below(sd->o1, sd->event_obj);
+		       evas_object_pass_events_set(sd->o1, 1);
+		       evas_object_smart_member_add(sd->o1, sd->smart_obj);
+		       e_icon_fill_inside_set(sd->o1, 0);
+		       evas_object_clip_set(sd->o1, evas_object_clip_get(sd->smart_obj));
+		       evas_object_show(sd->o1);
+		    }
+		  sd->o2 =  e_util_icon_theme_icon_add(it2->icon, "512x512",
+						       evas_object_evas_get(sd->smart_obj));
+		  if (sd->o2)
+		    {
+		       e_icon_scale_size_set(sd->o2, 0);
+		       evas_object_stack_below(sd->o2, sd->event_obj);
+		       evas_object_pass_events_set(sd->o2, 1);
+		       evas_object_smart_member_add(sd->o2, sd->smart_obj);
+		       e_icon_fill_inside_set(sd->o2, 0);
+		       evas_object_clip_set(sd->o2, evas_object_clip_get(sd->smart_obj));
+		       evas_object_show(sd->o2);
+		    }
+		  if (at < 128)
+		    {
+		       if (it1->func) it1->func(it1->data);
+		    }
+		  else
+		    {
+		       if (it2->func) it2->func(it2->data);
+		    }
+	       }
+	  }
+     }
+   evas_object_color_get(sd->smart_obj, &r, &g, &b, &a);
+
+   evas_object_move(sd->o1, sd->x - sd->dist + dp, sd->y);
+//   printf("SZ: %ix%i\n", sd->w + sd->dist + sd->dist, sd->h);
+   evas_object_resize(sd->o1, sd->w + sd->dist + sd->dist, sd->h);
+   evas_object_color_set(sd->o1, r, g, b, a);
+
+   evas_object_move(sd->o2, sd->x - sd->dist - sd->dist + dp, sd->y);
+   evas_object_resize(sd->o2, sd->w + sd->dist + sd->dist, sd->h);
+   evas_object_color_set(sd->o2, (r * at) / 255, (g * at) / 255, (b * at) / 255, (a * at) / 255);
+}
+
+static void
+_e_smart_add(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   Evas_Object *o;
+
+   sd = calloc(1, sizeof(E_Smart_Data));
+   if (!sd) return;
+   evas_object_smart_data_set(obj, sd);
+
+   sd->smart_obj = obj;
+   sd->x = 0;
+   sd->y = 0;
+   sd->w = 0;
+   sd->h = 0;
+
+   evas_object_propagate_events_set(obj, 0);
+
+   sd->dist = 48;
+   sd->pos = 0;
+   sd->p1 = -1;
+   sd->p2 = -1;
+
+   o = evas_object_rectangle_add(evas_object_evas_get(obj));
+   sd->event_obj = o;
+   evas_object_color_set(o, 0, 0, 0, 0);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd);
+   evas_object_smart_member_add(o, obj);
+   evas_object_repeat_events_set(o, 1);
+
+   sd->slide_time = 0.5;
+}
+
+static void
+_e_smart_del(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   if (sd->slide_animator) ecore_animator_del(sd->slide_animator);
+   while (sd->items)
+     {
+	E_Smart_Item *it;
+	
+	it = sd->items->data;
+	sd->items = evas_list_remove_list(sd->items, sd->items);
+	if (it->label) evas_stringshare_del(it->label);
+	if (it->icon) evas_stringshare_del(it->icon);
+	free(it);
+     }
+   evas_object_del(sd->event_obj);
+   if (sd->o1) evas_object_del(sd->o1);
+   if (sd->o2) evas_object_del(sd->o2);
+   free(sd);
+}
+
+static void
+_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   INTERNAL_ENTRY;
+   sd->x = x;
+   sd->y = y;
+   _e_smart_reconfigure(sd);
+}
+
+static void
+_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   INTERNAL_ENTRY;
+   sd->w = w;
+   sd->h = h;
+   _e_smart_reconfigure(sd);
+}
+
+static void
+_e_smart_show(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_show(sd->event_obj);
+}
+
+static void
+_e_smart_hide(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_hide(sd->event_obj);
+}
+
+static void
+_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
+{
+   INTERNAL_ENTRY;
+   if (sd->o1) evas_object_color_set(sd->o1, r, g, b, a);
+   if (sd->o2) evas_object_color_set(sd->o2, r, g, b, a);
+}
+
+static void
+_e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
+{
+   INTERNAL_ENTRY;
+   evas_object_clip_set(sd->event_obj, clip);
+   if (sd->o1) evas_object_clip_set(sd->o1, clip);
+   if (sd->o2) evas_object_clip_set(sd->o2, clip);
+}
+
+static void
+_e_smart_clip_unset(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_clip_unset(sd->event_obj);
+}
+
+/* never need to touch this */
+
+static void
+_e_smart_init(void)
+{
+   if (_e_smart) return;
+     {
+	static const Evas_Smart_Class sc =
+	  {
+	     SMART_NAME,
+	       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
+	  };
+	_e_smart = evas_smart_class_new(&sc);
+     }
+}
+
diff --git a/src/bin/e_slidecore.h b/src/bin/e_slidecore.h
new file mode 100644
index 0000000..c5026eb
--- /dev/null
+++ b/src/bin/e_slidecore.h
@@ -0,0 +1,16 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_SLIDECORE_H
+#define E_SLIDECORE_H
+
+EAPI Evas_Object *e_slidecore_add              (Evas *evas);
+EAPI void         e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist);
+EAPI void         e_slidecore_item_add         (Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data);
+EAPI void         e_slidecore_jump             (Evas_Object *obj, int num);
+EAPI void         e_slidecore_slide_time_set   (Evas_Object *obj, double t);
+
+#endif
+#endif
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index 30920f8..a1dd15a 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -1,7 +1,9 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+#define _XOPEN_SOURCE 600
 #include "e.h"
+#include <math.h>
 
 #define SMART_NAME "e_slider"
 #define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c
new file mode 100644
index 0000000..8ba7f23
--- /dev/null
+++ b/src/bin/e_slidesel.c
@@ -0,0 +1,374 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+#define SMART_NAME "e_slidesel"
+#define API_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
+#define INTERNAL_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return;
+typedef struct _E_Smart_Data E_Smart_Data;
+typedef struct _E_Smart_Item E_Smart_Item;
+
+struct _E_Smart_Data
+{ 
+   Evas_Coord   x, y, w, h;
+   
+   Evas_Object *smart_obj;
+   Evas_Object *edje_obj;
+   Evas_Object *event_obj;
+   Evas_Object *slide_obj;
+   Evas_List *items;
+   Evas_Coord down_x, down_y;
+   E_Smart_Item *cur;
+   double down_time;
+   unsigned char down : 1;
+   unsigned char down_cancel : 1;
+}; 
+
+struct _E_Smart_Item
+{
+   E_Smart_Data *sd;
+   const char *label;
+   const char *icon;
+   void (*func) (void *data);
+   void *data;
+};
+
+/* local subsystem functions */
+static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _e_smart_reconfigure(E_Smart_Data *sd);
+static void _e_smart_add(Evas_Object *obj);
+static void _e_smart_del(Evas_Object *obj);
+static void _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static void _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+static void _e_smart_show(Evas_Object *obj);
+static void _e_smart_hide(Evas_Object *obj);
+static void _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
+static void _e_smart_clip_set(Evas_Object *obj, Evas_Object * clip);
+static void _e_smart_clip_unset(Evas_Object *obj);
+static void _e_smart_init(void);
+
+/* local subsystem globals */
+static Evas_Smart *_e_smart = NULL;
+
+static void
+_e_smart_label_change(void *data)
+{
+   E_Smart_Item *it;
+   
+   it = data;
+   edje_object_part_text_set(it->sd->edje_obj, "e.text.label", it->label);
+   it->sd->cur = it;
+}
+
+/* externally accessible functions */
+EAPI Evas_Object *
+e_slidesel_add(Evas *evas)
+{
+   _e_smart_init();
+   return evas_object_smart_add(evas, _e_smart);
+}
+
+EAPI void
+e_slidesel_item_distance_set(Evas_Object *obj, Evas_Coord dist)
+{
+   API_ENTRY return;
+   e_slidecore_item_distance_set(sd->slide_obj, dist);
+}
+
+EAPI void
+e_slidesel_item_add(Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data)
+{
+   E_Smart_Item *it;
+   
+   API_ENTRY return;
+   it = calloc(1, sizeof(E_Smart_Item));
+   if (!it) return;
+   it->sd = sd;
+   if (label) it->label = evas_stringshare_add(label);
+   if (icon) it->icon = evas_stringshare_add(icon);
+   it->func = func;
+   it->data = data;
+   sd->items = evas_list_append(sd->items, it);
+   e_slidecore_item_add(sd->slide_obj, label, icon, _e_smart_label_change, it);
+}
+
+EAPI void
+e_slidesel_jump(Evas_Object *obj, int num)
+{
+   API_ENTRY return;
+   e_slidecore_jump(sd->slide_obj, num);
+}
+
+/* local subsystem functions */
+static void
+_e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Wheel *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+}
+
+static void
+_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if (ev->button == 1)
+     {
+	sd->down_time = ecore_time_get();
+	sd->down = 1;
+	sd->down_cancel = 0;
+	sd->down_x = ev->canvas.x;
+	sd->down_y = ev->canvas.y;
+	edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,on", "e");
+     }
+}
+
+static void
+_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if (ev->button == 1)
+     {
+	double t;
+	
+	t = ecore_time_get();
+	if (!sd->down_cancel)
+	  {
+	     edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,off", "e");
+	     if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
+	       {
+		  if (sd->cur)
+		    {
+		       /* get rid of accidental release and presses */
+//		       if ((t - sd->down_time) > 0.2)
+			 {
+			    edje_object_signal_emit(sd->edje_obj, "e,action,select", "e");
+			    if (sd->cur->func) sd->cur->func(sd->cur->data);
+			 }
+		    }
+	       }
+	  }
+	sd->down = 0;
+     }
+}
+
+static void
+_e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   E_Smart_Data *sd;
+
+   sd = data;
+   ev = event_info;
+   if ((sd->down) && (!sd->down_cancel))
+     {
+	Evas_Coord d1, d2, d;
+	
+	printf("DRAG @ %3.3f\n", ecore_time_get());
+	d1 = ev->cur.canvas.x - sd->down_x;
+	d2 = ev->cur.canvas.y - sd->down_y;
+	d = (d1 * d1) + (d2 * d2);
+	if (d > (64 * 64))
+	  {
+	     edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,off", "e");
+	     sd->down_cancel = 1;
+	  }
+     }
+}
+
+static void
+_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Key_Down *ev;
+   E_Smart_Data *sd;
+   
+   sd = data;
+   ev = event_info;
+/*   
+   if (!strcmp(ev->keyname, "Left"))
+     x -= sd->step.x;
+   else if (!strcmp(ev->keyname, "Right"))
+     x += sd->step.x;
+   else if (!strcmp(ev->keyname, "Up"))
+     y -= sd->step.y;
+   else if (!strcmp(ev->keyname, "Home"))
+     y = 0;
+   else if (!strcmp(ev->keyname, "End"))
+     y = my;
+   else if (!strcmp(ev->keyname, "Down"))
+     y += sd->step.y;
+   else if (!strcmp(ev->keyname, "Prior"))
+     {
+	if (sd->page.y < 0)
+	  y -= -(sd->page.y * vh) / 100;
+	else
+	  y -= sd->page.y;
+     }
+   else if (!strcmp(ev->keyname, "Next"))
+     {
+	if (sd->page.y < 0)
+	  y += -(sd->page.y * vh) / 100;
+	else
+	  y += sd->page.y;
+     }
+ */
+}
+                    
+static void
+_e_smart_reconfigure(E_Smart_Data *sd)
+{
+   evas_object_move(sd->edje_obj, sd->x, sd->y);
+   evas_object_resize(sd->edje_obj, sd->w, sd->h);
+   evas_object_move(sd->event_obj, sd->x, sd->y);
+   evas_object_resize(sd->event_obj, sd->w, sd->h);
+}
+
+static void
+_e_smart_add(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   Evas_Object *o;
+   
+   sd = calloc(1, sizeof(E_Smart_Data));
+   if (!sd) return;
+   evas_object_smart_data_set(obj, sd);
+   
+   sd->smart_obj = obj;
+   sd->x = 0;
+   sd->y = 0;
+   sd->w = 0;
+   sd->h = 0;
+   
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _e_smart_event_key_down, sd);
+   evas_object_propagate_events_set(obj, 0);
+   
+   o = edje_object_add(evas_object_evas_get(obj));
+   sd->edje_obj = o;
+   e_theme_edje_object_set(o, "base/theme/widgets",
+			   "e/widgets/slidesel");
+   evas_object_smart_member_add(o, obj);
+   
+   o = e_slidecore_add(evas_object_evas_get(obj));
+   sd->slide_obj = o;
+   edje_object_part_swallow(sd->edje_obj, "e.swallow.content", o);
+   evas_object_show(o);
+   
+   o = evas_object_rectangle_add(evas_object_evas_get(obj));
+   sd->event_obj = o;
+   evas_object_color_set(o, 0, 0, 0, 0);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _e_smart_event_wheel, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd);
+   evas_object_smart_member_add(o, obj);
+   evas_object_repeat_events_set(o, 1);
+}
+
+static void
+_e_smart_del(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_del(sd->slide_obj);
+   evas_object_del(sd->edje_obj);
+   evas_object_del(sd->event_obj);
+   free(sd);
+}
+
+static void
+_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   INTERNAL_ENTRY;
+   sd->x = x;
+   sd->y = y;
+   _e_smart_reconfigure(sd);
+}
+
+static void
+_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   INTERNAL_ENTRY;
+   sd->w = w;
+   sd->h = h;
+   _e_smart_reconfigure(sd);
+}
+
+static void
+_e_smart_show(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_show(sd->edje_obj);
+   evas_object_show(sd->event_obj);
+}
+
+static void
+_e_smart_hide(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_hide(sd->edje_obj);
+   evas_object_hide(sd->event_obj);
+}
+
+static void
+_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
+{
+   INTERNAL_ENTRY;
+   evas_object_color_set(sd->edje_obj, r, g, b, a);
+}
+
+static void
+_e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
+{
+   INTERNAL_ENTRY;
+   evas_object_clip_set(sd->edje_obj, clip);
+   evas_object_clip_set(sd->event_obj, clip);
+}
+
+static void
+_e_smart_clip_unset(Evas_Object *obj)
+{
+   INTERNAL_ENTRY;
+   evas_object_clip_unset(sd->edje_obj);
+   evas_object_clip_unset(sd->event_obj);
+}  
+
+/* never need to touch this */
+
+static void
+_e_smart_init(void)
+{
+   if (_e_smart) return;
+     {
+	static const Evas_Smart_Class sc =
+	  {
+	     SMART_NAME,
+	       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
+	  };
+	_e_smart = evas_smart_class_new(&sc);
+     }
+}
+
diff --git a/src/bin/e_slidesel.h b/src/bin/e_slidesel.h
new file mode 100644
index 0000000..f113310
--- /dev/null
+++ b/src/bin/e_slidesel.h
@@ -0,0 +1,15 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_SLIDESEL_H
+#define E_SLIDESEL_H
+
+EAPI Evas_Object *e_slidesel_add               (Evas *evas);
+EAPI void         e_slidesel_item_distance_set (Evas_Object *obj, Evas_Coord dist);
+EAPI void         e_slidesel_item_add          (Evas_Object *obj, const char *label, const char *icon,  void (*func) (void *data), void *data);
+EAPI void         e_slidesel_jump              (Evas_Object *obj, int num);
+    
+#endif
+#endif
diff --git a/src/bin/e_test.c b/src/bin/e_test.c
index 698604e..1aa340e 100644
--- a/src/bin/e_test.c
+++ b/src/bin/e_test.c
@@ -669,6 +669,76 @@ _e_test_internal(E_Container *con)
    e_color_dialog_select_callback_set(d, _e_test_cb_ok, NULL);
 }
 
+#elif 0
+static void
+_e_test_internal(E_Container *con)
+{
+   E_Dialog *dia;
+   Evas_Object *o, *ob, *of;
+   Evas_Coord mw, mh;
+   int i;
+   
+   dia = e_dialog_new(con, "E", "_test");
+   e_dialog_title_set(dia, "A Test Dialog");
+
+   of = e_scrollframe_add(dia->win->evas);
+   
+   ob = e_box_add(dia->win->evas);
+   e_box_orientation_set(ob, 0);
+
+   for (i = 0; i < 8; i++)
+     {
+   o = e_slidesel_add(dia->win->evas);
+   e_slidesel_item_distance_set(o, 64);
+   e_slidesel_item_add(o, "blah / item 1", 
+		       "/home/raster/pix/OLD/Download/Crystalline____a.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / smelly fish", 
+		       "/home/raster/pix/OLD/Download/Reluctant_Sunrise.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / pong", 
+		       "/home/raster/pix/OLD/Download/Soft_Wings.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / on a stick", 
+		       "/home/raster/pix/OLD/Download/Stock_rose_1.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / oath", 
+		       "/home/raster/pix/OLD/Download/The_Eyes_Of_A_Killer.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / yiiihaaaaa", 
+		       "/home/raster/pix/OLD/Download/lady_bug.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / blah blah blah",
+		       "/home/raster/pix/OLD/Download/ocean_rocks_covered_by_ash.jpg",
+		       NULL, NULL);
+   e_slidesel_item_add(o, "blah / bing bing bing", 
+		       "/home/raster/pix/OLD/Download/orange_chair_heaven_falling.jpg",
+		       NULL, NULL);
+   
+   e_box_pack_end(ob, o);
+   e_box_pack_options_set(o, 1, 1, 1, 0, 0.5, 0.5, 300, 100, 300, 100);
+   evas_object_show(o);
+     }
+   
+   /* fixme... more */
+   e_box_min_size_get(ob, &mw, &mh);
+   evas_object_resize(ob, mw, mh);
+
+   e_scrollframe_child_set(of, ob);
+   evas_object_show(ob);
+//   e_widget_min_size_get(o, &mw, &mh);
+   mw = 300; mh = 300;
+   e_dialog_content_set(dia, of, mw, mh);
+   evas_object_show(of);
+   
+   /* buttons at the bottom */
+   e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
+   e_dialog_resizable_set(dia, 1);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+   e_win_resize(dia->win, 400, 400);
+   
+}
 #else
 static void
 _e_test_internal(E_Container *con)
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index ce30fbd..3e9c69f 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -13,8 +13,8 @@ struct _E_Theme_Result
    Evas_Hash  *quickfind;
 };
 
-static Evas_Bool _e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool _e_theme_mappings_quickfind_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
 static void      _e_theme_category_register(const char *category);
 static Evas_List *_e_theme_collection_item_register(Evas_List *list, const char *name);
 static Evas_List *_e_theme_collection_items_find(const char *base, const char *collname);
@@ -495,7 +495,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
 
 /* local subsystem functions */
 static Evas_Bool
-_e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    E_Theme_Result *res;
    
@@ -512,7 +512,7 @@ _e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fd
 }
 
 static Evas_Bool
-_e_theme_mappings_quickfind_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
 {
    evas_stringshare_del(key);
    return 1;
diff --git a/src/bin/e_tlist.c b/src/bin/e_tlist.c
index deea166..4d559d2 100644
--- a/src/bin/e_tlist.c
+++ b/src/bin/e_tlist.c
@@ -14,70 +14,69 @@ typedef struct _E_Smart_Item E_Smart_Item;
 
 struct _E_Smart_Data
 {
-   Evas_Coord          x, y, w, h;
-
-   Evas_Object        *smart_obj;
-   Evas_Object        *box_obj;
-   Evas_List          *items;
-   int                 selected;
-   unsigned char       selector : 1;
-   unsigned char       on_hold : 1;
+   Evas_Coord x, y, w, h;
+
+   Evas_Object *smart_obj;
+   Evas_Object *box_obj;
+   Evas_List *items;
+   int selected;
+   unsigned char selector : 1;
+   unsigned char on_hold : 1;
 };
 
 struct _E_Smart_Item
 {
-   E_Smart_Data       *sd;
-   Evas_Object        *base_obj;
-   void                (*func) (void *data, void *data2);
-   void                (*func_hilight) (void *data, void *data2);
-   void               *data;
-   void               *data2;
-   unsigned char       markup:1;
+   E_Smart_Data *sd;
+   Evas_Object *base_obj;
+   void (*func) (void *data, void *data2);
+   void (*func_hilight) (void *data, void *data2);
+   void *data, *data2;
+   unsigned char markup:1;
 };
 
 /* local subsystem functions */
-static void         _e_tlist_append(Evas_Object * obj, char *label,
-				    void (*func) (void *data, void *data2),
-				    void (*func_hilight) (void *data,
-							  void *data2),
-				    void *data, void *data2, int markup);
-static void         _e_smart_event_mouse_down(void *data, Evas * e,
+static void _e_tlist_append(Evas_Object * obj, const char *label,
+                            void (*func) (void *data, void *data2),
+                            void (*func_hilight) (void *data,
+                                                  void *data2),
+                            void *data, void *data2, int markup);
+static void _e_smart_event_mouse_down(void *data, Evas * e,
 					      Evas_Object * obj,
 					      void *event_info);
-static void         _e_smart_event_mouse_up(void *data, Evas * e,
+static void _e_smart_event_mouse_up(void *data, Evas * e,
 					    Evas_Object * obj,
 					    void *event_info);
-static void         _e_smart_event_key_down(void *data, Evas * e,
+static void _e_smart_event_key_down(void *data, Evas * e,
 					    Evas_Object * obj,
 					    void *event_info);
-static void         _e_smart_reconfigure(E_Smart_Data * sd);
-static void         _e_smart_add(Evas_Object * obj);
-static void         _e_smart_del(Evas_Object * obj);
-static void         _e_smart_move(Evas_Object * obj, Evas_Coord x,
-				  Evas_Coord y);
-static void         _e_smart_resize(Evas_Object * obj, Evas_Coord w,
-				    Evas_Coord h);
-static void         _e_smart_show(Evas_Object * obj);
-static void         _e_smart_hide(Evas_Object * obj);
-static void         _e_smart_color_set(Evas_Object * obj, int r, int g, int b,
-				       int a);
-static void         _e_smart_clip_set(Evas_Object * obj, Evas_Object * clip);
-static void         _e_smart_clip_unset(Evas_Object * obj);
-static void         _e_smart_init(void);
+static void _e_smart_reconfigure(E_Smart_Data * sd);
+static void _e_smart_add(Evas_Object * obj);
+static void _e_smart_del(Evas_Object * obj);
+static void _e_smart_move(Evas_Object * obj, Evas_Coord x,
+                          Evas_Coord y);
+static void _e_smart_resize(Evas_Object * obj, Evas_Coord w,
+                            Evas_Coord h);
+static void _e_smart_show(Evas_Object * obj);
+static void _e_smart_hide(Evas_Object * obj);
+static void _e_smart_color_set(Evas_Object * obj, int r, int g, int b,
+                               int a);
+static void _e_smart_clip_set(Evas_Object * obj, Evas_Object * clip);
+static void _e_smart_clip_unset(Evas_Object * obj);
+static void _e_smart_init(void);
 
 /* local subsystem globals */
-static Evas_Smart  *_e_smart = NULL;
+static Evas_Smart *_e_smart = NULL;
 
 /* externally accessible functions */
-EAPI Evas_Object   *
-e_tlist_add(Evas * evas)
+EAPI Evas_Object *
+e_tlist_add(Evas *evas)
 {
    _e_smart_init();
    return evas_object_smart_add(evas, _e_smart);
 }
 
 EAPI void
-e_tlist_append(Evas_Object * obj, char *label,
+e_tlist_append(Evas_Object *obj, const char *label,
 	       void (*func) (void *data, void *data2),
 	       void (*func_hilight) (void *data, void *data2), void *data,
 	       void *data2)
@@ -86,7 +85,7 @@ e_tlist_append(Evas_Object * obj, char *label,
 }
 
 EAPI void
-e_tlist_markup_append(Evas_Object * obj, char *label,
+e_tlist_markup_append(Evas_Object *obj, const char *label,
 		      void (*func) (void *data, void *data2),
 		      void (*func_hilight) (void *data, void *data2),
 		      void *data, void *data2)
@@ -95,110 +94,94 @@ e_tlist_markup_append(Evas_Object * obj, char *label,
 }
 
 EAPI void
-e_tlist_selected_set(Evas_Object * obj, int n)
+e_tlist_selected_set(Evas_Object *obj, int n)
 {
-   E_Smart_Item       *si;
+   E_Smart_Item *si;
 
-   API_ENTRY           return;
-
-   if (!sd->items)
-      return;
+   API_ENTRY return;
+   if (!sd->items) return;
    if (n >= evas_list_count(sd->items))
-      n = evas_list_count(sd->items) - 1;
+     n = evas_list_count(sd->items) - 1;
    else if (n < 0)
-      n = 0;
-   if (sd->selected == n)
-      return;
+     n = 0;
+   if (sd->selected == n) return;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
-      edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
+     edje_object_signal_emit(si->base_obj, "e,state,unselected", "e");
    sd->selected = n;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      {
 	evas_object_raise(si->base_obj);
 	edje_object_signal_emit(si->base_obj, "e,state,selected", "e");
-	if (si->func_hilight)
-	   si->func_hilight(si->data, si->data2);
+	if (si->func_hilight) si->func_hilight(si->data, si->data2);
 	if (!sd->selector)
 	  {
 	     if (!sd->on_hold)
 	       {
-		  if (si->func)
-		    si->func(si->data, si->data2);
+		  if (si->func) si->func(si->data, si->data2);
 	       }
 	  }
      }
 }
 
 EAPI int
-e_tlist_selected_get(Evas_Object * obj)
+e_tlist_selected_get(Evas_Object *obj)
 {
-   API_ENTRY           return -1;
-
-   if (!sd->items)
-      return -1;
+   API_ENTRY return -1;
+   if (!sd->items) return -1;
    return sd->selected;
 }
 
-EAPI const char    *
-e_tlist_selected_label_get(Evas_Object * obj)
+EAPI const char *
+e_tlist_selected_label_get(Evas_Object *obj)
 {
-   E_Smart_Item       *si;
+   E_Smart_Item *si;
 
-   API_ENTRY           return NULL;
-
-   if (!sd->items)
-      return NULL;
+   API_ENTRY return NULL;
+   if (!sd->items) return NULL;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      {
 	if (si->markup)
-	   return edje_object_part_text_get(si->base_obj, "e.textblock.label");
+          return edje_object_part_text_get(si->base_obj, "e.textblock.label");
 	else
-	   return edje_object_part_text_get(si->base_obj, "e.text.label");
+          return edje_object_part_text_get(si->base_obj, "e.text.label");
      }
    return NULL;
 }
 
-EAPI void          *
-e_tlist_selected_data_get(Evas_Object * obj)
+EAPI void *
+e_tlist_selected_data_get(Evas_Object *obj)
 {
-   E_Smart_Item       *si;
-
-   API_ENTRY           return NULL;
+   E_Smart_Item *si;
 
-   if (!sd->items)
-      return NULL;
+   API_ENTRY return NULL;
+   if (!sd->items) return NULL;
    si = evas_list_nth(sd->items, sd->selected);
-   if (si)
-      return si->data;
+   if (si) return si->data;
    return NULL;
 }
 
-EAPI void          *
-e_tlist_selected_data2_get(Evas_Object * obj)
+EAPI void *
+e_tlist_selected_data2_get(Evas_Object *obj)
 {
-   E_Smart_Item       *si;
-
-   API_ENTRY           return NULL;
+   E_Smart_Item *si;
 
-   if (!sd->items)
-      return NULL;
+   API_ENTRY return NULL;
+   if (!sd->items) return NULL;
    si = evas_list_nth(sd->items, sd->selected);
-   if (si)
-      return si->data2;
+   if (si) return si->data2;
    return NULL;
 }
 
 EAPI void
-e_tlist_selected_geometry_get(Evas_Object * obj, Evas_Coord * x, Evas_Coord * y,
-			      Evas_Coord * w, Evas_Coord * h)
+e_tlist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
+			      Evas_Coord *w, Evas_Coord *h)
 {
-   E_Smart_Item       *si;
-
-   API_ENTRY           return;
+   E_Smart_Item *si;
 
+   API_ENTRY return;
    si = evas_list_nth(sd->items, sd->selected);
    if (si)
      {
@@ -209,74 +192,66 @@ e_tlist_selected_geometry_get(Evas_Object * obj, Evas_Coord * x, Evas_Coord * y,
 }
 
 EAPI void
-e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w, Evas_Coord * h)
+e_tlist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
-   API_ENTRY           return;
-
+   API_ENTRY return;
    e_box_min_size_get(sd->box_obj, w, h);
 }
 
 EAPI void
-e_tlist_selector_set(Evas_Object * obj, int selector)
+e_tlist_selector_set(Evas_Object *obj, int selector)
 {
-   API_ENTRY           return;
-
+   API_ENTRY return;
    sd->selector = selector;
 }
 
 EAPI int
-e_tlist_selector_get(Evas_Object * obj)
+e_tlist_selector_get(Evas_Object *obj)
 {
-   API_ENTRY           return 0;
-
+   API_ENTRY return 0;
    return sd->selector;
 }
 
 EAPI void
-e_tlist_remove_num(Evas_Object * obj, int n)
+e_tlist_remove_num(Evas_Object *obj, int n)
 {
-   E_Smart_Item       *si;
-
-   API_ENTRY           return;
+   E_Smart_Item *si;
 
-   if (!sd->items)
-      return;
+   API_ENTRY return;
+   if (!sd->items) return;
    si = evas_list_nth(sd->items, n);
    if (si)
      {
 	sd->items = evas_list_remove(sd->items, si);
-	if (e_tlist_selected_get(obj) == n)
-	   sd->selected = -1;
+	if (e_tlist_selected_get(obj) == n) sd->selected = -1;
 	evas_object_del(si->base_obj);
 	free(si);
      }
 }
 
 EAPI void
-e_tlist_remove_label(Evas_Object * obj, char *label)
+e_tlist_remove_label(Evas_Object *obj, const char *label)
 {
-   E_Smart_Item       *si;
-   Evas_List          *l;
-   int                 i;
-
-   API_ENTRY           return;
+   E_Smart_Item *si;
+   Evas_List *l;
+   int i;
 
-   if (!sd->items)
-      return;
-   if (!label)
-      return;
+   API_ENTRY return;
+   if (!sd->items) return;
+   if (!label) return;
    for (i = 0, l = sd->items; l; l = l->next, i++)
      {
 	si = l->data;
 	if (si)
 	  {
-	     char               *t;
+	     char *t;
 
 	     if (si->markup)
-		t = strdup(edje_object_part_text_get
-			   (si->base_obj, "e.textblock.label"));
+               t = strdup(edje_object_part_text_get
+                          (si->base_obj, "e.textblock.label"));
 	     else
-		t = strdup(edje_object_part_text_get(si->base_obj, "e.text.label"));
+               t = strdup(edje_object_part_text_get(si->base_obj, 
+                                                    "e.text.label"));
 	     if (!strcmp(t, label))
 	       {
 		  evas_object_del(si->base_obj);
@@ -290,10 +265,9 @@ e_tlist_remove_label(Evas_Object * obj, char *label)
 }
 
 EAPI int
-e_tlist_count(Evas_Object * obj)
+e_tlist_count(Evas_Object *obj)
 {
-   API_ENTRY           return 0;
-
+   API_ENTRY return 0;
    return evas_list_count(sd->items);
 }
 
@@ -315,16 +289,15 @@ e_tlist_clear(Evas_Object *obj)
 
 /* local subsystem functions */
 static void
-_e_tlist_append(Evas_Object * obj, char *label,
+_e_tlist_append(Evas_Object *obj, const char *label,
 		void (*func) (void *data, void *data2),
 		void (*func_hilight) (void *data, void *data2), void *data,
 		void *data2, int markup)
 {
-   E_Smart_Item       *si;
-   Evas_Coord          mw = 0, mh = 0;
-
-   API_ENTRY           return;
+   E_Smart_Item *si;
+   Evas_Coord mw = 0, mh = 0;
 
+   API_ENTRY return;
    si = E_NEW(E_Smart_Item, 1);
    si->sd = sd;
    si->markup = markup;
@@ -332,15 +305,15 @@ _e_tlist_append(Evas_Object * obj, char *label,
 
    /* FIXME: Use a color class or something to avoid duplicating the theme with only the background piccie being different. */
    if (evas_list_count(sd->items) & 0x1)
-      e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
-			      "e/widgets/tlist_odd");
+     e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
+                             "e/widgets/tlist_odd");
    else
-      e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
-			      "e/widgets/tlist");
+     e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
+                             "e/widgets/tlist");
    if (si->markup)
-      edje_object_part_text_set(si->base_obj, "e.textblock.label", label);
+     edje_object_part_text_set(si->base_obj, "e.textblock.label", label);
    else
-      edje_object_part_text_set(si->base_obj, "e.text.label", label);
+     edje_object_part_text_set(si->base_obj, "e.text.label", label);
    si->func = func;
    si->func_hilight = func_hilight;
    si->data = data;
@@ -353,7 +326,7 @@ _e_tlist_append(Evas_Object * obj, char *label,
 			  0.5, 0.5,	/* align */
 			  mw, mh,	/* min */
 			  99999, 99999	/* max */
-      );
+                          );
    evas_object_lower(si->base_obj);
    evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_DOWN,
 				  _e_smart_event_mouse_down, si);
@@ -363,20 +336,19 @@ _e_tlist_append(Evas_Object * obj, char *label,
 }
 
 static void
-_e_smart_event_mouse_down(void *data, Evas * e, Evas_Object * obj,
+_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj,
 			  void *event_info)
 {
    Evas_Event_Mouse_Down *ev;
-   E_Smart_Item       *si;
-   Evas_List          *l;
-   int                 i;
+   E_Smart_Item *si;
+   Evas_List *l;
+   int i;
 
    si = data;
    ev = event_info;
-   
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) si->sd->on_hold = 1;
    else si->sd->on_hold = 0;
-   
+
    for (i = 0, l = si->sd->items; l; l = l->next, i++)
      {
 	if (l->data == si)
@@ -388,17 +360,17 @@ _e_smart_event_mouse_down(void *data, Evas * e, Evas_Object * obj,
 }
 
 static void
-_e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
+_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj,
 			void *event_info)
 {
    Evas_Event_Mouse_Up *ev;
-   E_Smart_Item       *si;
+   E_Smart_Item *si;
 
    si = data;
    ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) si->sd->on_hold = 1;
    else si->sd->on_hold = 0;
-   
+
    if (si->sd->selector)
      {
 	si = evas_list_nth(si->sd->items, si->sd->selected);
@@ -406,8 +378,7 @@ _e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
 	  {
 	     if (!si->sd->on_hold)
 	       {
-		  if (si->func)
-		    si->func(si->data, si->data2);
+		  if (si->func) si->func(si->data, si->data2);
 	       }
 	  }
      }
@@ -415,59 +386,55 @@ _e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
 }
 
 static void
-_e_smart_event_key_down(void *data, Evas * e, Evas_Object * obj,
+_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj,
 			void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   E_Smart_Data       *sd;
+   E_Smart_Data *sd;
+   int n;
 
    sd = data;
    ev = event_info;
    if (!strcmp(ev->keyname, "Up"))
      {
-	int                 n;
-
 	n = e_tlist_selected_get(sd->smart_obj);
 	e_tlist_selected_set(sd->smart_obj, n - 1);
      }
    else if (!strcmp(ev->keyname, "Down"))
      {
-	int                 n;
-
 	n = e_tlist_selected_get(sd->smart_obj);
 	e_tlist_selected_set(sd->smart_obj, n + 1);
      }
-   else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "space")))
+   else if ((!strcmp(ev->keyname, "Return")) || 
+            (!strcmp(ev->keyname, "space")))
      {
         if (!sd->on_hold)
 	  {
-	     E_Smart_Item       *si;
-	     
+	     E_Smart_Item *si;
+
 	     si = evas_list_nth(sd->items, sd->selected);
 	     if (si)
 	       {
-		  if (si->func)
-		    si->func(si->data, si->data2);
+		  if (si->func) si->func(si->data, si->data2);
 	       }
 	  }
      }
 }
 
 static void
-_e_smart_reconfigure(E_Smart_Data * sd)
+_e_smart_reconfigure(E_Smart_Data *sd)
 {
    evas_object_move(sd->box_obj, sd->x, sd->y);
    evas_object_resize(sd->box_obj, sd->w, sd->h);
 }
 
 static void
-_e_smart_add(Evas_Object * obj)
+_e_smart_add(Evas_Object *obj)
 {
-   E_Smart_Data       *sd;
+   E_Smart_Data *sd;
 
    sd = calloc(1, sizeof(E_Smart_Data));
-   if (!sd)
-      return;
+   if (!sd) return;
    evas_object_smart_data_set(obj, sd);
 
    sd->smart_obj = obj;
@@ -475,7 +442,6 @@ _e_smart_add(Evas_Object * obj)
    sd->y = 0;
    sd->w = 0;
    sd->h = 0;
-
    sd->selected = -1;
 
    sd->box_obj = e_box_add(evas_object_evas_get(obj));
@@ -489,12 +455,12 @@ _e_smart_add(Evas_Object * obj)
 }
 
 static void
-_e_smart_del(Evas_Object * obj)
+_e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    while (sd->items)
      {
-	E_Smart_Item       *si;
+	E_Smart_Item *si;
 
 	si = sd->items->data;
 	sd->items = evas_list_remove_list(sd->items, sd->items);
@@ -506,84 +472,72 @@ _e_smart_del(Evas_Object * obj)
 }
 
 static void
-_e_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
+_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
    INTERNAL_ENTRY;
-   if ((sd->x == x) && (sd->y == y))
-      return;
+   if ((sd->x == x) && (sd->y == y)) return;
    sd->x = x;
    sd->y = y;
    _e_smart_reconfigure(sd);
 }
 
 static void
-_e_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h)
+_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 {
    INTERNAL_ENTRY;
-   if ((sd->w == w) && (sd->h == h))
-      return;
+   if ((sd->w == w) && (sd->h == h)) return;
    sd->w = w;
    sd->h = h;
    _e_smart_reconfigure(sd);
 }
 
 static void
-_e_smart_show(Evas_Object * obj)
+_e_smart_show(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    evas_object_show(sd->box_obj);
 }
 
 static void
-_e_smart_hide(Evas_Object * obj)
+_e_smart_hide(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    evas_object_hide(sd->box_obj);
 }
 
 static void
-_e_smart_color_set(Evas_Object * obj, int r, int g, int b, int a)
+_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
    INTERNAL_ENTRY;
    evas_object_color_set(sd->box_obj, r, g, b, a);
 }
 
 static void
-_e_smart_clip_set(Evas_Object * obj, Evas_Object * clip)
+_e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
    evas_object_clip_set(sd->box_obj, clip);
 }
 
 static void
-_e_smart_clip_unset(Evas_Object * obj)
+_e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    evas_object_clip_unset(sd->box_obj);
 }
 
 /* never need to touch this */
-
 static void
 _e_smart_init(void)
 {
    if (_e_smart) return;
+   static const Evas_Smart_Class sc =
      {
-	static const Evas_Smart_Class sc =
-	  {
-	     SMART_NAME,
-	       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
-	  };
-	_e_smart = evas_smart_class_new(&sc);
-     }
+        SMART_NAME,
+          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
+     };
+   _e_smart = evas_smart_class_new(&sc);
 }
diff --git a/src/bin/e_tlist.h b/src/bin/e_tlist.h
index 4e67cac..f4256a2 100644
--- a/src/bin/e_tlist.h
+++ b/src/bin/e_tlist.h
@@ -7,12 +7,12 @@
 #define E_TLIST_H
 
 EAPI Evas_Object   *e_tlist_add(Evas * evas);
-EAPI void           e_tlist_append(Evas_Object * obj, char *label,
+EAPI void           e_tlist_append(Evas_Object * obj, const char *label,
 				   void (*func) (void *data, void *data2),
 				   void (*func_hilight) (void *data,
 							 void *data2),
 				   void *data, void *data2);
-EAPI void           e_tlist_markup_append(Evas_Object * obj, char *label,
+EAPI void           e_tlist_markup_append(Evas_Object * obj, const char *label,
 					  void (*func) (void *data,
 							void *data2),
 					  void (*func_hilight) (void *data,
@@ -33,7 +33,7 @@ EAPI void           e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w,
 EAPI void           e_tlist_selector_set(Evas_Object * obj, int selector);
 EAPI int            e_tlist_selector_get(Evas_Object * obj);
 EAPI void           e_tlist_remove_num(Evas_Object * obj, int n);
-EAPI void           e_tlist_remove_label(Evas_Object * obj, char *label);
+EAPI void           e_tlist_remove_label(Evas_Object * obj, const char *label);
 EAPI int            e_tlist_count(Evas_Object * obj);
 EAPI void           e_tlist_clear(Evas_Object * obj);
 
diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c
index 765591b..2488394 100644
--- a/src/bin/e_widget_check.c
+++ b/src/bin/e_widget_check.c
@@ -23,7 +23,7 @@ static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *even
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_check_add(Evas *evas, char *label, int *val)
+e_widget_check_add(Evas *evas, const char *label, int *val)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
@@ -90,7 +90,7 @@ e_widget_check_checked_get(Evas_Object *check)
 }
 
 EAPI Evas_Object *
-e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int icon_h, int *val) 
+e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int *val) 
 {
    Evas_Object *obj, *o, *o2;
    E_Widget_Data *wd;
@@ -192,6 +192,7 @@ _e_wid_do(Evas_Object *obj)
 	  }
      }
    evas_object_smart_callback_call(obj, "changed", NULL);
+   e_widget_change(obj);
 }
 
 static void
diff --git a/src/bin/e_widget_check.h b/src/bin/e_widget_check.h
index b867cd9..eb870d6 100644
--- a/src/bin/e_widget_check.h
+++ b/src/bin/e_widget_check.h
@@ -6,10 +6,10 @@
 #ifndef E_WIDGET_CHECK_H
 #define E_WIDGET_CHECK_H
 
-EAPI Evas_Object *e_widget_check_add(Evas *evas, char *label, int *val);
+EAPI Evas_Object *e_widget_check_add(Evas *evas, const char *label, int *val);
 EAPI void	  e_widget_check_checked_set(Evas_Object *check, int checked);
 EAPI int	  e_widget_check_checked_get(Evas_Object *check);
-EAPI Evas_Object *e_widget_check_icon_add(Evas *evas, char *label, char *icon, int icon_w, int icon_h, int *val);
+EAPI Evas_Object *e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int *val);
 
 #endif
 #endif
diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c
new file mode 100644
index 0000000..4147668
--- /dev/null
+++ b/src/bin/e_widget_flist.c
@@ -0,0 +1,245 @@
+#include "e.h"
+
+typedef struct _E_Widget_Data E_Widget_Data;
+struct _E_Widget_Data 
+{
+   Evas_Object *o_scroll, *o_fm;
+   E_Fm2_Config fmc;
+};
+
+/* private function prototypes */
+static void _e_wid_del_hook(Evas_Object *obj);
+static void _e_wid_focus_hook(Evas_Object *obj);
+static void _e_wid_focus_steal(void *data, Evas *evas, Evas_Object *obj, void *event);
+static void _e_wid_cb_scroll_resize(void *data, Evas *evas, Evas_Object *obj, void *event);
+static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event);
+static void _e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event);
+static void _e_wid_cb_changed(void *data, Evas_Object *obj, void *event);
+static void _e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event);
+
+EAPI Evas_Object *
+e_widget_flist_add(Evas *evas) 
+{
+   Evas_Object *obj, *o;
+   E_Widget_Data *wd;
+
+   wd = E_NEW(E_Widget_Data, 1);
+   if (!wd) return NULL;
+
+   obj = e_widget_add(evas);
+   e_widget_del_hook_set(obj, _e_wid_del_hook);
+   e_widget_focus_hook_set(obj, _e_wid_focus_hook);
+   e_widget_data_set(obj, wd);
+
+   o = e_scrollframe_add(evas);
+   wd->o_scroll = o;
+   evas_object_show(o);
+   e_widget_sub_object_add(obj, o);
+   e_widget_resize_object_set(obj, o);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _e_wid_focus_steal, obj);
+
+   o = e_fm2_add(evas);
+   wd->o_fm = o;
+   memset(&wd->fmc, 0, sizeof(E_Fm2_Config));
+   wd->fmc.view.mode = E_FM2_VIEW_MODE_LIST;
+   wd->fmc.view.open_dirs_in_place = 1;
+   wd->fmc.view.selector = 1;
+   wd->fmc.view.single_click = 0;
+   wd->fmc.view.no_subdir_jump = 0;
+   wd->fmc.icon.list.w = 48;
+   wd->fmc.icon.list.h = 48;
+   wd->fmc.icon.fixed.w = 1;
+   wd->fmc.icon.fixed.h = 1;
+   wd->fmc.icon.extension.show = 0;
+   wd->fmc.icon.key_hint = NULL;
+   wd->fmc.list.sort.no_case = 1;
+   wd->fmc.list.sort.dirs.first = 0;
+   wd->fmc.list.sort.dirs.last = 0;
+   wd->fmc.selection.single = 1;
+   wd->fmc.selection.windows_modifiers = 0;
+   e_fm2_config_set(wd->o_fm, &wd->fmc);
+   e_fm2_icon_menu_flags_set(wd->o_fm, E_FM2_MENU_NO_SHOW_HIDDEN);
+
+   evas_object_smart_callback_add(wd->o_fm, "dir_changed", 
+                                  _e_wid_cb_dir_changed, obj);
+   evas_object_smart_callback_add(wd->o_fm, "selection_change", 
+                                  _e_wid_cb_selected, obj);
+   evas_object_smart_callback_add(wd->o_fm, "changed", 
+                                  _e_wid_cb_changed, obj);
+   evas_object_smart_callback_add(wd->o_fm, "files_deleted", 
+                                  _e_wid_cb_file_deleted, obj);
+
+   evas_object_event_callback_add(wd->o_scroll, EVAS_CALLBACK_RESIZE, 
+                                  _e_wid_cb_scroll_resize, wd->o_fm);
+
+   e_scrollframe_child_set(wd->o_scroll, o);
+   e_scrollframe_extern_pan_set(wd->o_scroll, o, e_fm2_pan_set, 
+                                e_fm2_pan_get, e_fm2_pan_max_get, 
+                                e_fm2_pan_child_size_get);
+
+   e_widget_sub_object_add(obj, o);
+   evas_object_show(o);
+   evas_object_smart_callback_add(o, "selected", 
+                                  _e_wid_cb_selected, obj);
+
+   evas_object_resize(obj, 32, 32);
+   e_widget_min_size_set(obj, 32, 32);
+   return obj;
+}
+
+EAPI void 
+e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   e_fm2_path_set(wd->o_fm, dev, path);
+   e_scrollframe_child_pos_set(wd->o_scroll, 0, 0);
+}
+
+EAPI Evas_List *
+e_widget_flist_all_list_get(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   return e_fm2_all_list_get(wd->o_fm);
+}
+
+EAPI Evas_List *
+e_widget_flist_selected_list_get(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   return e_fm2_selected_list_get(wd->o_fm);
+}
+
+EAPI const char *
+e_widget_flist_real_path_get(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   return e_fm2_real_path_get(wd->o_fm);
+}
+
+EAPI int 
+e_widget_flist_has_parent_get(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   return e_fm2_has_parent_get(wd->o_fm);
+}
+
+EAPI void 
+e_widget_flist_select_set(Evas_Object *obj, const char *file, int select) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   e_fm2_select_set(wd->o_fm, file, select);
+}
+
+EAPI void 
+e_widget_flist_file_show(Evas_Object *obj, const char *file) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   e_fm2_file_show(wd->o_fm, file);
+}
+
+EAPI void 
+e_widget_flist_parent_go(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   e_fm2_parent_go(wd->o_fm);
+   e_scrollframe_child_pos_set(wd->o_scroll, 0, 0);
+}
+
+EAPI void 
+e_widget_flist_refresh(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   e_fm2_refresh(wd->o_fm);
+}
+
+/* private functions */
+static void 
+_e_wid_del_hook(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   E_FREE(wd);
+}
+
+static void 
+_e_wid_focus_hook(Evas_Object *obj) 
+{
+   E_Widget_Data *wd = NULL;
+
+   wd = e_widget_data_get(obj);
+   if (e_widget_focus_get(obj)) 
+     {
+        edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scroll), 
+                                "e,state,focused", "e");
+        evas_object_focus_set(wd->o_fm, 1);
+     }
+   else 
+     {
+        edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scroll), 
+                                "e,state,unfocused", "e");
+        evas_object_focus_set(wd->o_fm, 0);
+     }
+}
+
+static void 
+_e_wid_focus_steal(void *data, Evas *evas, Evas_Object *obj, void *event) 
+{
+   e_widget_focus_steal(data);
+}
+
+static void 
+_e_wid_cb_scroll_resize(void *data, Evas *evas, Evas_Object *obj, void *event) 
+{
+   int vw, vh, mw, mh, w, h;
+
+   e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
+   evas_object_geometry_get(obj, NULL, NULL, &mw, &h);
+   if (vw >= mw)
+     {
+        if (w != vw) evas_object_resize(data, vw, h);
+     }
+}
+
+static void 
+_e_wid_cb_selected(void *data, Evas_Object *obj, void *event) 
+{
+   evas_object_smart_callback_call(data, "selection_change", event);
+}
+
+static void 
+_e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event) 
+{
+   evas_object_smart_callback_call(data, "dir_changed", event);
+}
+
+static void 
+_e_wid_cb_changed(void *data, Evas_Object *obj, void *event) 
+{
+   evas_object_smart_callback_call(data, "changed", event);
+}
+
+static void 
+_e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event) 
+{
+   evas_object_smart_callback_call(data, "files_deleted", event);
+}
diff --git a/src/bin/e_widget_flist.h b/src/bin/e_widget_flist.h
new file mode 100644
index 0000000..6134ea8
--- /dev/null
+++ b/src/bin/e_widget_flist.h
@@ -0,0 +1,18 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_WIDGET_FLIST_H
+#define E_WIDGET_FLIST_H
+
+EAPI Evas_Object *e_widget_flist_add(Evas *evas);
+EAPI void e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path);
+EAPI Evas_List *e_widget_flist_all_list_get(Evas_Object *obj);
+EAPI Evas_List *e_widget_flist_selected_list_get(Evas_Object *obj);
+EAPI const char *e_widget_flist_real_path_get(Evas_Object *obj);
+EAPI int e_widget_flist_has_parent_get(Evas_Object *obj);
+EAPI void e_widget_flist_select_set(Evas_Object *obj, const char *file, int select);
+EAPI void e_widget_flist_file_show(Evas_Object *obj, const char *file);
+EAPI void e_widget_flist_parent_go(Evas_Object *obj);
+EAPI void e_widget_flist_refresh(Evas_Object *obj);
+
+#endif
+#endif
diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c
index ded509f..9e148b7 100644
--- a/src/bin/e_widget_frametable.c
+++ b/src/bin/e_widget_frametable.c
@@ -16,7 +16,7 @@ static void _e_wid_disable_hook(Evas_Object *obj);
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_frametable_add(Evas *evas, char *label, int homogenous)
+e_widget_frametable_add(Evas *evas, const char *label, int homogenous)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
@@ -87,7 +87,7 @@ e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double va
 }
 
 EAPI void
-e_widget_frametable_label_set(Evas_Object *obj, char *label)
+e_widget_frametable_label_set(Evas_Object *obj, const char *label)
 {
    E_Widget_Data *wd;
    
diff --git a/src/bin/e_widget_frametable.h b/src/bin/e_widget_frametable.h
index 2844d33..eb045eb 100644
--- a/src/bin/e_widget_frametable.h
+++ b/src/bin/e_widget_frametable.h
@@ -6,10 +6,10 @@
 #ifndef E_WIDGET_FRAMETABLE_H
 #define E_WIDGET_FRAMETABLE_H
 
-EAPI Evas_Object *e_widget_frametable_add(Evas *evas, char *label, int homogenous);
+EAPI Evas_Object *e_widget_frametable_add(Evas *evas, const char *label, int homogenous);
 EAPI void e_widget_frametable_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);
 EAPI void e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign);
-EAPI void e_widget_frametable_label_set(Evas_Object *obj, char *label);
+EAPI void e_widget_frametable_label_set(Evas_Object *obj, const char *label);
 
 #endif
 #endif
diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c
index ad162bc..eea8056 100644
--- a/src/bin/e_widget_ilist.c
+++ b/src/bin/e_widget_ilist.c
@@ -32,24 +32,25 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, char **value)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
-   
+
+   wd = E_NEW(E_Widget_Data, 1);
+   if (!wd) return NULL;
+
    obj = e_widget_add(evas);
-   
+
    e_widget_del_hook_set(obj, _e_wid_del_hook);
    e_widget_focus_hook_set(obj, _e_wid_focus_hook);
-   wd = E_NEW(E_Widget_Data, 1);
-   if (!wd) return NULL;
    e_widget_data_set(obj, wd);
 
    wd->value = value;
-   
+
    o = e_scrollframe_add(evas);
    wd->o_scrollframe = o;
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
-   
+
    o = e_ilist_add(evas);
    wd->o_ilist = o;
    e_ilist_icon_size_set(o, icon_w, icon_h);
@@ -58,7 +59,7 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, char **value)
    e_widget_sub_object_add(obj, o);
    evas_object_show(o);
    evas_object_smart_callback_add(o, "selected", _e_wid_cb_selected, obj);
-   
+
    evas_object_resize(obj, 32, 32);
    e_widget_min_size_set(obj, 32, 32);
    return obj;
@@ -68,7 +69,7 @@ EAPI void
 e_widget_ilist_freeze(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_freeze(wd->o_ilist);
 }
@@ -77,7 +78,7 @@ EAPI void
 e_widget_ilist_thaw(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_thaw(wd->o_ilist);
 }
@@ -87,10 +88,11 @@ e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, vo
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
-   
-   wd = e_widget_data_get(obj);
+
    wcb = E_NEW(E_Widget_Callback, 1);
    if (!wcb) return;
+
+   wd = e_widget_data_get(obj);
    wcb->func = func;
    wcb->data = data;
    if (val) wcb->value = strdup(val);
@@ -104,10 +106,11 @@ e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb, *rcb;
-   
-   wd = e_widget_data_get(obj);
+
    wcb = E_NEW(E_Widget_Callback, 1);
    if (!wcb) return;
+
+   wd = e_widget_data_get(obj);
    wcb->func = func;
    wcb->data = data;
    if (val) wcb->value = strdup(val);
@@ -132,10 +135,11 @@ e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, v
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
-   
-   wd = e_widget_data_get(obj);
+
    wcb = E_NEW(E_Widget_Callback, 1);
    if (!wcb) return;
+
+   wd = e_widget_data_get(obj);
    wcb->func = func;
    wcb->data = data;
    if (val) wcb->value = strdup(val);
@@ -149,14 +153,15 @@ e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb, *rcb;
-   
-   wd = e_widget_data_get(obj);
+
    wcb = E_NEW(E_Widget_Callback, 1);
    if (!wcb) return;
+
+   wd = e_widget_data_get(obj);
    wcb->func = func;
    wcb->data = data;
    if (val) wcb->value = strdup(val);
-   
+
    rcb = evas_list_nth(wd->callbacks, relative);
    if (rcb) 
      {
@@ -177,10 +182,11 @@ e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *la
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
-   
-   wd = e_widget_data_get(obj);
+
    wcb = E_NEW(E_Widget_Callback, 1);
    if (!wcb) return;
+
+   wd = e_widget_data_get(obj);
    wd->callbacks = evas_list_append(wd->callbacks, wcb);
    e_ilist_append(wd->o_ilist, icon, label, 1, NULL, NULL, NULL, NULL);
    if (icon) evas_object_show(icon);
@@ -190,7 +196,7 @@ EAPI void
 e_widget_ilist_selector_set(Evas_Object *obj, int selector)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_selector_set(wd->o_ilist, selector);
 }
@@ -200,7 +206,7 @@ e_widget_ilist_go(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    Evas_Coord mw, mh, vw, vh, w, h;
-   
+
    wd = e_widget_data_get(obj);
    wd->o_widget = obj;
    e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
@@ -229,7 +235,7 @@ e_widget_ilist_clear(Evas_Object *obj)
    while (wd->callbacks)
      {
 	E_Widget_Callback *wcb;
-	
+
 	wcb = wd->callbacks->data;
 	if (wcb->value) free(wcb->value);
 	free(wcb);
@@ -241,7 +247,7 @@ EAPI int
 e_widget_ilist_count(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_count(wd->o_ilist);
 }
@@ -250,7 +256,7 @@ EAPI Evas_List *
 e_widget_ilist_items_get(Evas_Object *obj) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_items_get(wd->o_ilist);
 }
@@ -259,7 +265,7 @@ EAPI int
 e_widget_ilist_nth_is_header(Evas_Object *obj, int n) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_nth_is_header(wd->o_ilist, n);
 }
@@ -267,8 +273,8 @@ e_widget_ilist_nth_is_header(Evas_Object *obj, int n)
 EAPI void
 e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
 {
-    E_Widget_Data *wd;
-   
+   E_Widget_Data *wd;
+
    wd = e_widget_data_get(obj);
    e_ilist_nth_label_set(wd->o_ilist, n, label);
 }
@@ -276,8 +282,8 @@ e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
 EAPI const char *
 e_widget_ilist_nth_label_get(Evas_Object *obj, int n)
 {
-    E_Widget_Data *wd;
-   
+   E_Widget_Data *wd;
+
    wd = e_widget_data_get(obj);
    return e_ilist_nth_label_get(wd->o_ilist, n);
 }
@@ -285,8 +291,8 @@ e_widget_ilist_nth_label_get(Evas_Object *obj, int n)
 EAPI void
 e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
 {
-    E_Widget_Data *wd;
-   
+   E_Widget_Data *wd;
+
    wd = e_widget_data_get(obj);
    e_ilist_nth_icon_set(wd->o_ilist, n, icon);
 }
@@ -294,8 +300,8 @@ e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
 EAPI Evas_Object *
 e_widget_ilist_nth_icon_get(Evas_Object *obj, int n)
 {
-    E_Widget_Data *wd;
-   
+   E_Widget_Data *wd;
+
    wd = e_widget_data_get(obj);
    return e_ilist_nth_icon_get(wd->o_ilist, n);
 }
@@ -305,7 +311,7 @@ e_widget_ilist_nth_data_get(Evas_Object *obj, int n)
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
-   
+
    wd = e_widget_data_get(obj);
    wcb = evas_list_nth(wd->callbacks, n);
 
@@ -327,6 +333,7 @@ e_widget_ilist_nth_show(Evas_Object *obj, int n, int top)
 {
    E_Widget_Data *wd;
    Evas_Coord x, y, w, h;
+
    wd = e_widget_data_get(obj);
    e_ilist_nth_geometry_get(wd->o_ilist, n, &x, &y, &w, &h);
    if (top)
@@ -339,7 +346,7 @@ EAPI void
 e_widget_ilist_selected_set(Evas_Object *obj, int n)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_selected_set(wd->o_ilist, n);
 }
@@ -348,7 +355,7 @@ EAPI int
 e_widget_ilist_selected_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_selected_get(wd->o_ilist);
 }
@@ -357,7 +364,7 @@ EAPI const char *
 e_widget_ilist_selected_label_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_selected_label_get(wd->o_ilist);
 }
@@ -366,7 +373,7 @@ EAPI Evas_Object *
 e_widget_ilist_selected_icon_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_selected_icon_get(wd->o_ilist);
 }
@@ -375,7 +382,7 @@ EAPI int
 e_widget_ilist_selected_count_get(Evas_Object *obj) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_selected_count_get(wd->o_ilist);
 }
@@ -384,7 +391,7 @@ EAPI void
 e_widget_ilist_unselect(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    if ((wd->value) && *(wd->value))
        {
@@ -399,11 +406,10 @@ e_widget_ilist_remove_num(Evas_Object *obj, int n)
 {
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_remove_num(wd->o_ilist, n);
-   wcb = evas_list_nth(wd->callbacks, n);
-   if (!wcb) return;
+   if (!(wcb = evas_list_nth(wd->callbacks, n))) return;
    if (wcb->value) free(wcb->value);
    free(wcb);
    wd->callbacks = evas_list_remove(wd->callbacks, wcb);
@@ -413,7 +419,7 @@ EAPI void
 e_widget_ilist_multi_select_set(Evas_Object *obj, int multi) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_multi_select_set(wd->o_ilist, multi);
 }
@@ -422,7 +428,7 @@ EAPI int
 e_widget_ilist_multi_select_get(Evas_Object *obj) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_ilist_multi_select_get(wd->o_ilist);
 }
@@ -431,7 +437,7 @@ EAPI void
 e_widget_ilist_multi_select(Evas_Object *obj, int n) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_multi_select(wd->o_ilist, n);
 }
@@ -440,7 +446,7 @@ EAPI void
 e_widget_ilist_range_select(Evas_Object *obj, int n) 
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    e_ilist_range_select(wd->o_ilist, n);
 }
@@ -449,12 +455,12 @@ static void
 _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    while (wd->callbacks)
      {
 	E_Widget_Callback *wcb;
-	
+
 	wcb = wd->callbacks->data;
 	if (wcb->value) free(wcb->value);
 	free(wcb);
@@ -467,7 +473,7 @@ static void
 _e_wid_focus_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    if (e_widget_focus_get(obj))
      {
@@ -501,7 +507,7 @@ _e_wid_cb_item_sel(void *data, void *data2)
    E_Widget_Data *wd;
    Evas_Coord x, y, w, h;
    E_Widget_Callback *wcb;
-   
+
    wd = data;
    wcb = data2;
    e_ilist_selected_geometry_get(wd->o_ilist, &x, &y, &w, &h);
@@ -527,7 +533,7 @@ _e_wid_cb_item_hilight(void *data, void *data2)
    E_Widget_Data *wd;
    Evas_Coord x, y, w, h;
    E_Widget_Callback *wcb;
-   
+
    wd = data;
    wcb = data2;
    e_ilist_selected_geometry_get(wd->o_ilist, &x, &y, &w, &h);
diff --git a/src/bin/e_widget_image.c b/src/bin/e_widget_image.c
index def6d4e..08db83e 100644
--- a/src/bin/e_widget_image.c
+++ b/src/bin/e_widget_image.c
@@ -73,7 +73,7 @@ e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh)
 }
 
 EAPI void
-e_widget_image_edje_set(Evas_Object *obj, char *file, char *part)
+e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part)
 {
    E_Widget_Data *wd;
    
@@ -83,7 +83,7 @@ e_widget_image_edje_set(Evas_Object *obj, char *file, char *part)
 }
 
 EAPI void
-e_widget_image_file_set(Evas_Object *obj, char *file)
+e_widget_image_file_set(Evas_Object *obj, const char *file)
 {
    E_Widget_Data *wd;
    
@@ -93,7 +93,7 @@ e_widget_image_file_set(Evas_Object *obj, char *file)
 }
 
 EAPI void
-e_widget_image_file_key_set(Evas_Object *obj, char *file, char *key)
+e_widget_image_file_key_set(Evas_Object *obj, const char *file, const char *key)
 {
    E_Widget_Data *wd;
    
diff --git a/src/bin/e_widget_image.h b/src/bin/e_widget_image.h
index eea51fd..3fd69e1 100644
--- a/src/bin/e_widget_image.h
+++ b/src/bin/e_widget_image.h
@@ -8,9 +8,9 @@
 
 EAPI Evas_Object     *e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int minh);
 EAPI Evas_Object     *e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh);
-EAPI void             e_widget_image_edje_set(Evas_Object *obj, char *file, char *part);
-EAPI void             e_widget_image_file_set(Evas_Object *obj, char *file);
-EAPI void             e_widget_image_file_key_set(Evas_Object *obj, char *file, char *key);
+EAPI void             e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part);
+EAPI void             e_widget_image_file_set(Evas_Object *obj, const char *file);
+EAPI void             e_widget_image_file_key_set(Evas_Object *obj, const char *file, const char *key);
 EAPI void             e_widget_image_object_set(Evas_Object *obj, Evas_Object *o);
     
 #endif
diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c
index 36b3b14..a348d63 100644
--- a/src/bin/e_widget_preview.c
+++ b/src/bin/e_widget_preview.c
@@ -9,9 +9,9 @@ struct _E_Widget_Data
    Evas_Object *obj, *o_frame, *img, *o_thumb, *o_extern;
 };
 
+/* local subsystem functions */
 static void _e_wid_del_hook(Evas_Object *obj);
 static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info);
-/* local subsystem functions */
 
 /* externally accessible functions */
 EAPI Evas_Object *
@@ -20,21 +20,21 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
    Evas_Coord mw, mh;
-   
+
    obj = e_widget_add(evas);
    e_widget_del_hook_set(obj, _e_wid_del_hook);
    wd = calloc(1, sizeof(E_Widget_Data));
+   if (!wd) return NULL;
 
    wd->obj = obj;
-   
+
    o = edje_object_add(evas);
    wd->o_frame = o;
-   e_theme_edje_object_set(o, "base/theme/widgets",
-			   "e/widgets/preview");
+   e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/preview");
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
-   
+
    o = e_livethumb_add(evas);
    wd->img = o;
    e_livethumb_vsize_set(o, minw * 2, minh * 2);
@@ -42,13 +42,13 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
    edje_extern_object_max_size_set(o, minw, minh);
    evas_object_show(o);
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", o);
-   
+
    e_widget_data_set(obj, wd);   
    e_widget_can_focus_set(obj, 0);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
    e_widget_min_size_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
-      
+
    return obj;
 }
 
@@ -56,7 +56,7 @@ EAPI Evas *
 e_widget_preview_evas_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return e_livethumb_evas_get(wd->img);
 }
@@ -65,7 +65,7 @@ EAPI void
 e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    wd->o_extern = eobj;
    e_livethumb_thumb_set(wd->img, wd->o_extern);
@@ -75,15 +75,15 @@ EAPI int
 e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
-   
    if (wd->o_thumb) evas_object_del(wd->o_thumb);
 
    wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img));
    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);
+
    return 1;
 }
 
@@ -91,15 +91,14 @@ EAPI int
 e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
-   
    if (wd->img)
      {
 	e_widget_sub_object_del(obj, wd->img);
 	evas_object_del(wd->img);
      }
-   
+
    wd->img = e_thumb_icon_add(evas_object_evas_get(obj));
    e_widget_sub_object_add(obj, wd->img);
    if (e_util_glob_case_match(file, "*.edj"))
@@ -117,9 +116,10 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key,
    evas_object_smart_callback_add(wd->img, "e_thumb_gen", _e_wid_preview_thumb_gen, wd);
    e_thumb_icon_size_set(wd->img, w, h);
    e_thumb_icon_begin(wd->img);
-   
+
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
    evas_object_show(wd->img);
+
    return 1;
 }
 
@@ -145,13 +145,14 @@ e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group)
 {
    E_Widget_Data *wd;
    int ret;
-   
+
    wd = e_widget_data_get(obj);
    if (wd->o_thumb) evas_object_del(wd->o_thumb);
    wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img));
    ret = edje_object_file_set(wd->o_thumb, file, group);
    evas_object_show(wd->o_thumb);
    e_livethumb_thumb_set(wd->img, wd->o_thumb);
+
    return ret;
 }
 
@@ -159,7 +160,7 @@ static void
 _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    free(wd);
 }
diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c
index bb5092f..7ffbf55 100644
--- a/src/bin/e_widget_radio.c
+++ b/src/bin/e_widget_radio.c
@@ -39,7 +39,7 @@ e_widget_radio_group_new(int *val)
 }
 
 EAPI Evas_Object *
-e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group)
+e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *group)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
@@ -82,7 +82,7 @@ e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group)
 }
 
 EAPI Evas_Object *
-e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group)
+e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group)
 {
    Evas_Object *obj, *o, *o2;
    E_Widget_Data *wd;
diff --git a/src/bin/e_widget_radio.h b/src/bin/e_widget_radio.h
index 7a35f49..a10ae77 100644
--- a/src/bin/e_widget_radio.h
+++ b/src/bin/e_widget_radio.h
@@ -9,8 +9,8 @@
 typedef struct _E_Radio_Group E_Radio_Group;
 
 EAPI E_Radio_Group *e_widget_radio_group_new(int *val);
-EAPI Evas_Object *e_widget_radio_add(Evas *evas, char *label, int valnum, E_Radio_Group *group);
-EAPI Evas_Object *e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group);
+EAPI Evas_Object *e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *group);
+EAPI Evas_Object *e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group);
 EAPI void e_widget_radio_toggle_set(Evas_Object *obj, int toggle);
 
 #endif
diff --git a/src/bin/e_widget_scrollframe.c b/src/bin/e_widget_scrollframe.c
index 4987095..375b7a9 100644
--- a/src/bin/e_widget_scrollframe.c
+++ b/src/bin/e_widget_scrollframe.c
@@ -14,6 +14,7 @@ static void _e_wid_focus_hook(Evas_Object *obj);
 static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj,
 void *event_info);
+
 /* externally accessible functions */
 EAPI Evas_Object *
 e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child)
@@ -22,7 +23,7 @@ e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child)
    Evas_Object *obj, *o;
 
    obj = e_widget_add(evas);
-   
+
    e_widget_del_hook_set(obj, _e_wid_del_hook);
    e_widget_focus_hook_set(obj, _e_wid_focus_hook);
    wd = calloc(1, sizeof(E_Widget_Data));
@@ -35,7 +36,8 @@ e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child)
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _e_wid_focus_steal, obj);
 
    e_scrollframe_child_set(wd->o_scrollframe, child);
    evas_object_show(child);
@@ -52,9 +54,9 @@ e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set) (Evas
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
-   
+
    obj = e_widget_add(evas);
-   
+
    e_widget_del_hook_set(obj, _e_wid_del_hook);
    e_widget_focus_hook_set(obj, _e_wid_focus_hook);
    wd = calloc(1, sizeof(E_Widget_Data));
@@ -65,12 +67,14 @@ e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set) (Evas
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _e_wid_focus_steal, obj);
 
-   e_scrollframe_extern_pan_set(o, pan, pan_set, pan_get, pan_max_get, pan_child_size_get);
+   e_scrollframe_extern_pan_set(o, pan, pan_set, pan_get, pan_max_get, 
+                                pan_child_size_get);
    evas_object_show(pan);
    e_widget_sub_object_add(obj, pan);
-   
+
    return obj;
 }
 
@@ -105,7 +109,7 @@ EAPI void
 e_widget_scrollframe_focus_object_set(Evas_Object *obj, Evas_Object *fobj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    wd->o_fobj = fobj;
 }
@@ -114,7 +118,7 @@ EAPI Evas_Object *
 e_widget_scrollframe_object_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    return wd->o_scrollframe;
 }
@@ -124,7 +128,7 @@ static void
 _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    free(wd);
 }
@@ -133,7 +137,7 @@ static void
 _e_wid_focus_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    if (e_widget_focus_get(obj))
      {
@@ -159,7 +163,7 @@ static void
 _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Coord mw, mh, vw, vh, w, h;    
-   
+
    e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
    e_widget_min_size_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
@@ -168,4 +172,3 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
 	if (w != vw) evas_object_resize(data, vw, h);
      }
 }
-
diff --git a/src/bin/e_widget_slider.c b/src/bin/e_widget_slider.c
index f83721a..b46c5b1 100644
--- a/src/bin/e_widget_slider.c
+++ b/src/bin/e_widget_slider.c
@@ -19,7 +19,7 @@ static void _e_wid_disable_hook(Evas_Object *obj);
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_slider_add(Evas *evas, int horiz, int rev, char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size)
+e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
diff --git a/src/bin/e_widget_slider.h b/src/bin/e_widget_slider.h
index b212bdf..e3e9941 100644
--- a/src/bin/e_widget_slider.h
+++ b/src/bin/e_widget_slider.h
@@ -6,7 +6,7 @@
 #ifndef E_WIDGET_SLIDER_H
 #define E_WIDGET_SLIDER_H
 
-EAPI Evas_Object *e_widget_slider_add(Evas *evas, int horiz, int rev, char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size);
+EAPI Evas_Object *e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size);
 EAPI int e_widget_slider_value_double_set(Evas_Object *slider, double dval);
 EAPI int e_widget_slider_value_int_set(Evas_Object *slider, int ival);
 EAPI int e_widget_slider_value_double_get(Evas_Object *slider, double *dval);
diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c
index b9b8e93..c3d2dbf 100644
--- a/src/bin/e_widget_textblock.c
+++ b/src/bin/e_widget_textblock.c
@@ -167,7 +167,6 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
    Evas_Coord mw, mh, vw, vh;
    
    wd = data;
-   e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
    edje_object_size_min_calc(wd->o_textblock, &mw, &mh);
    e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
    if (vw > mw) mw = vw;
diff --git a/src/bin/e_widget_tlist.c b/src/bin/e_widget_tlist.c
index 793e5c1..9ba530f 100644
--- a/src/bin/e_widget_tlist.c
+++ b/src/bin/e_widget_tlist.c
@@ -10,36 +10,37 @@ typedef struct _E_Widget_Data E_Widget_Data;
 typedef struct _E_Widget_Callback E_Widget_Callback;
 struct _E_Widget_Data
 {
-   Evas_Object        *o_widget, *o_scrollframe, *o_tlist;
-   Evas_List          *callbacks;
-   char              **value;
+   Evas_Object *o_widget, *o_scrollframe, *o_tlist;
+   Evas_List  *callbacks;
+   char  **value;
 };
 struct _E_Widget_Callback
 {
-   void                (*func) (void *data);
-   void               *data;
-   char               *value;
+   void (*func) (void *data);
+   void *data;
+   char *value;
 };
 
-static void         _e_widget_tlist_append(Evas_Object * obj, char *label,
-					   void (*func) (void *data),
-					   void *data, char *val, int markup);
-static void         _e_wid_del_hook(Evas_Object * obj);
-static void         _e_wid_focus_hook(Evas_Object * obj);
-static void         _e_wid_cb_scrollframe_resize(void *data, Evas * e,
-						 Evas_Object * obj,
-						 void *event_info);
-static void         _e_wid_cb_item_sel(void *data, void *data2);
-static void         _e_wid_cb_item_hilight(void *data, void *data2);
-static void         _e_wid_focus_steal(void *data, Evas * e, Evas_Object * obj,
-				       void *event_info);
+static void _e_widget_tlist_append(Evas_Object *obj, const char *label,
+                                   void (*func) (void *data),
+                                   void *data, const char *val,
+                                   int markup);
+static void _e_wid_del_hook(Evas_Object *obj);
+static void _e_wid_focus_hook(Evas_Object *obj);
+static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, 
+                                         Evas_Object *obj,
+                                         void *event_info);
+static void _e_wid_cb_item_sel(void *data, void *data2);
+static void _e_wid_cb_item_hilight(void *data, void *data2);
+static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj,
+                               void *event_info);
 
 /* externally accessible functions */
-EAPI Evas_Object   *
-e_widget_tlist_add(Evas * evas, char **value)
+EAPI Evas_Object *
+e_widget_tlist_add(Evas *evas, char **value)
 {
-   Evas_Object        *obj, *o;
-   E_Widget_Data      *wd;
+   Evas_Object *obj, *o;
+   E_Widget_Data *wd;
 
    obj = e_widget_add(evas);
 
@@ -72,126 +73,126 @@ e_widget_tlist_add(Evas * evas, char **value)
 }
 
 EAPI void
-e_widget_tlist_append(Evas_Object * obj, char *label, void (*func) (void *data),
-		      void *data, char *val)
+e_widget_tlist_append(Evas_Object *obj, const char *label,
+		      void (*func) (void *data), void *data, const char *val)
 {
    _e_widget_tlist_append(obj, label, func, data, val, 0);
 }
 
 EAPI void
-e_widget_tlist_markup_append(Evas_Object * obj, char *label,
-			     void (*func) (void *data), void *data, char *val)
+e_widget_tlist_markup_append(Evas_Object *obj, const char *label,
+			     void (*func) (void *data), void *data,
+			     const char *val)
 {
    _e_widget_tlist_append(obj, label, func, data, val, 1);
 }
 
 EAPI void
-e_widget_tlist_selected_set(Evas_Object * obj, int n)
+e_widget_tlist_selected_set(Evas_Object *obj, int n)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    e_tlist_selected_set(wd->o_tlist, n);
 }
 
 EAPI int
-e_widget_tlist_selected_get(Evas_Object * obj)
+e_widget_tlist_selected_get(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    return e_tlist_selected_get(wd->o_tlist);
 }
 
-EAPI const char    *
-e_widget_tlist_selected_label_get(Evas_Object * obj)
+EAPI const char *
+e_widget_tlist_selected_label_get(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    return e_tlist_selected_label_get(wd->o_tlist);
 }
 
 EAPI void
-e_widget_tlist_selector_set(Evas_Object * obj, int selector)
+e_widget_tlist_selector_set(Evas_Object *obj, int selector)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    e_tlist_selector_set(wd->o_tlist, selector);
 }
 
 EAPI void
-e_widget_tlist_go(Evas_Object * obj)
+e_widget_tlist_go(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    wd->o_widget = obj;
 }
 
 EAPI void
-e_widget_tlist_remove_num(Evas_Object * obj, int n)
+e_widget_tlist_remove_num(Evas_Object *obj, int n)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    e_tlist_remove_num(wd->o_tlist, n);
 }
 
 EAPI void
-e_widget_tlist_remove_label(Evas_Object * obj, char *label)
+e_widget_tlist_remove_label(Evas_Object *obj, const char *label)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    e_tlist_remove_label(wd->o_tlist, label);
 }
 
 EAPI int
-e_widget_tlist_count(Evas_Object * obj)
+e_widget_tlist_count(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    return e_tlist_count(wd->o_tlist);
 }
 
 static void
-_e_widget_tlist_append(Evas_Object * obj, char *label,
-		       void (*func) (void *data), void *data, char *val,
+_e_widget_tlist_append(Evas_Object *obj, const char *label,
+		       void (*func) (void *data), void *data, const char *val,
 		       int markup)
 {
-   E_Widget_Data      *wd;
-   Evas_Coord          mw, mh, vw, vh, w, h;
-   E_Widget_Callback  *wcb;
+   E_Widget_Data *wd;
+   Evas_Coord mw, mh, vw, vh, w, h;
+   E_Widget_Callback *wcb;
 
    wd = e_widget_data_get(obj);
    wcb = E_NEW(E_Widget_Callback, 1);
    wcb->func = func;
    wcb->data = data;
-   if (val)
-      wcb->value = strdup(val);
+   if (val) wcb->value = strdup(val);
    wd->callbacks = evas_list_append(wd->callbacks, wcb);
    if (markup)
-      e_tlist_markup_append(wd->o_tlist, label, _e_wid_cb_item_sel,
-			    _e_wid_cb_item_hilight, wd, wcb);
+     e_tlist_markup_append(wd->o_tlist, label, _e_wid_cb_item_sel,
+                           _e_wid_cb_item_hilight, wd, wcb);
    else
-      e_tlist_append(wd->o_tlist, label, _e_wid_cb_item_sel,
-		     _e_wid_cb_item_hilight, wd, wcb);
+     e_tlist_append(wd->o_tlist, label, _e_wid_cb_item_sel,
+                    _e_wid_cb_item_hilight, wd, wcb);
    e_tlist_min_size_get(wd->o_tlist, &mw, &mh);
    evas_object_resize(wd->o_tlist, mw, mh);
    e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
    evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
    if (mw > vw)
      {
-	Evas_Coord          wmw, wmh;
+	Evas_Coord wmw, wmh;
 
 	e_widget_min_size_get(obj, &wmw, &wmh);
 	e_widget_min_size_set(obj, mw + (w - vw), wmh);
      }
    else if (mw < vw)
-      evas_object_resize(wd->o_tlist, vw, mh);
+     evas_object_resize(wd->o_tlist, vw, mh);
 }
 
 EAPI void
@@ -204,9 +205,9 @@ e_widget_tlist_clear(Evas_Object *obj)
 }
 
 static void
-_e_wid_del_hook(Evas_Object * obj)
+_e_wid_del_hook(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    while (wd->callbacks)
@@ -214,8 +215,7 @@ _e_wid_del_hook(Evas_Object * obj)
 	E_Widget_Callback  *wcb;
 
 	wcb = wd->callbacks->data;
-	if (wcb->value)
-	   free(wcb->value);
+	if (wcb->value) free(wcb->value);
 	free(wcb);
 	wd->callbacks = evas_list_remove_list(wd->callbacks, wd->callbacks);
      }
@@ -223,9 +223,9 @@ _e_wid_del_hook(Evas_Object * obj)
 }
 
 static void
-_e_wid_focus_hook(Evas_Object * obj)
+_e_wid_focus_hook(Evas_Object *obj)
 {
-   E_Widget_Data      *wd;
+   E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
    if (e_widget_focus_get(obj))
@@ -243,27 +243,26 @@ _e_wid_focus_hook(Evas_Object * obj)
 }
 
 static void
-_e_wid_cb_scrollframe_resize(void *data, Evas * e, Evas_Object * obj,
+_e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj,
 			     void *event_info)
 {
-   Evas_Coord          mw, mh, vw, vh, w, h;
+   Evas_Coord mw, mh, vw, vh, w, h;
 
    e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
    e_tlist_min_size_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
    if (vw >= mw)
      {
-	if (w != vw)
-	   evas_object_resize(data, vw, h);
+	if (w != vw) evas_object_resize(data, vw, h);
      }
 }
 
 static void
 _e_wid_cb_item_sel(void *data, void *data2)
 {
-   E_Widget_Data      *wd;
-   Evas_Coord          x, y, w, h;
-   E_Widget_Callback  *wcb;
+   E_Widget_Data *wd;
+   Evas_Coord x, y, w, h;
+   E_Widget_Callback *wcb;
 
    wd = data;
    wcb = data2;
@@ -275,23 +274,22 @@ _e_wid_cb_item_sel(void *data, void *data2)
 	if (wd->value)
 	  {
 	     if (*(wd->value))
-		free(*(wd->value));
+               free(*(wd->value));
 	     if (wcb->value)
-		*(wd->value) = strdup(wcb->value);
+               *(wd->value) = strdup(wcb->value);
 	     else
-		*(wd->value) = NULL;
+               *(wd->value) = NULL;
 	  }
-	if (wcb->func)
-	   wcb->func(wcb->data);
+	if (wcb->func) wcb->func(wcb->data);
      }
 }
 
 static void
 _e_wid_cb_item_hilight(void *data, void *data2)
 {
-   E_Widget_Data      *wd;
-   Evas_Coord          x, y, w, h;
-   E_Widget_Callback  *wcb;
+   E_Widget_Data *wd;
+   Evas_Coord x, y, w, h;
+   E_Widget_Callback *wcb;
 
    wd = data;
    wcb = data2;
@@ -300,7 +298,7 @@ _e_wid_cb_item_hilight(void *data, void *data2)
 }
 
 static void
-_e_wid_focus_steal(void *data, Evas * e, Evas_Object * obj, void *event_info)
+_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    e_widget_focus_steal(data);
 }
diff --git a/src/bin/e_widget_tlist.h b/src/bin/e_widget_tlist.h
index 514ad08..15c3b94 100644
--- a/src/bin/e_widget_tlist.h
+++ b/src/bin/e_widget_tlist.h
@@ -7,12 +7,12 @@
 #define E_WIDGET_TLIST_H
 
 EAPI Evas_Object   *e_widget_tlist_add(Evas * evas, char **value);
-EAPI void           e_widget_tlist_append(Evas_Object * obj, char *label,
+EAPI void           e_widget_tlist_append(Evas_Object * obj, const char *label,
 					  void (*func) (void *data), void *data,
-					  char *val);
-EAPI void           e_widget_tlist_markup_append(Evas_Object * obj, char *label,
+					  const char *val);
+EAPI void           e_widget_tlist_markup_append(Evas_Object * obj, const char *label,
 						 void (*func) (void *data),
-						 void *data, char *val);
+						 void *data, const char *val);
 EAPI void           e_widget_tlist_selected_set(Evas_Object * obj, int n);
 EAPI void           e_widget_tlist_selector_set(Evas_Object * obj,
 						int selector);
@@ -20,7 +20,7 @@ EAPI void           e_widget_tlist_go(Evas_Object * obj);
 EAPI int            e_widget_tlist_selected_get(Evas_Object * obj);
 EAPI const char    *e_widget_tlist_selected_label_get(Evas_Object * obj);
 EAPI void           e_widget_tlist_remove_num(Evas_Object * obj, int n);
-EAPI void           e_widget_tlist_remove_label(Evas_Object * obj, char *label);
+EAPI void           e_widget_tlist_remove_label(Evas_Object * obj, const char *label);
 EAPI int            e_widget_tlist_count(Evas_Object * obj);
 EAPI void           e_widget_tlist_clear(Evas_Object * obj);
 
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index d6c0614..956ba32 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -506,6 +506,7 @@ e_zone_update_flip(E_Zone *zone)
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
    
    _e_zone_update_flip(zone);
+   _e_zone_update_edge(zone);
 }
 
 EAPI void
@@ -995,6 +996,8 @@ _e_zone_cb_timer(void *data)
    
    zone->flip.timer = NULL;
    
+   current = e_desk_current_get(zone);
+   
    if (current)
      ecore_event_add(E_EVENT_POINTER_WARP, ev, NULL, NULL);
    else
@@ -1014,6 +1017,7 @@ _e_zone_cb_desk_show(void *data, int type, void *event)
    if (ev->desk->zone != zone) return 1;
 
    _e_zone_update_flip(zone);
+   _e_zone_update_edge(zone);
    return 1;
 }
 
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index a8bdc7b..9cf4f36 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -8,7 +8,6 @@ battery \
 cpufreq \
 ibox \
 start \
-layout \
 exebuf \
 winlist \
 fileman \
@@ -50,7 +49,8 @@ conf_winlist \
 conf_exebuf \
 conf_paths \
 conf_mime \
-conf_interaction
+conf_interaction \
+conf_window_remembers
 
 if HAVE_TEMPERATURE
 SUBDIRS += temperature
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index a484d49..f5da466 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -61,8 +61,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = ibar dropshadow clock pager battery cpufreq ibox start \
-	layout exebuf winlist fileman wizard conf conf_wallpaper \
-	conf_theme conf_colors conf_fonts conf_borders conf_icon_theme \
+	exebuf winlist fileman wizard conf conf_wallpaper conf_theme \
+	conf_colors conf_fonts conf_borders conf_icon_theme \
 	conf_mouse_cursor conf_transitions conf_startup conf_intl \
 	conf_imc msgbus_lang conf_profiles conf_engine \
 	conf_applications conf_desks conf_desk conf_display \
@@ -71,7 +71,7 @@ DIST_SUBDIRS = ibar dropshadow clock pager battery cpufreq ibox start \
 	conf_window_display conf_window_focus conf_window_manipulation \
 	conf_menus conf_clientlist conf_dialogs conf_performance \
 	conf_winlist conf_exebuf conf_paths conf_mime conf_interaction \
-	temperature
+	conf_window_remembers temperature
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -96,6 +98,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -115,6 +118,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -140,6 +145,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -229,8 +235,8 @@ x_cflags = @x_cflags@
 x_libs = @x_libs@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = ibar dropshadow clock pager battery cpufreq ibox start \
-	layout exebuf winlist fileman wizard conf conf_wallpaper \
-	conf_theme conf_colors conf_fonts conf_borders conf_icon_theme \
+	exebuf winlist fileman wizard conf conf_wallpaper conf_theme \
+	conf_colors conf_fonts conf_borders conf_icon_theme \
 	conf_mouse_cursor conf_transitions conf_startup conf_intl \
 	conf_imc msgbus_lang conf_profiles conf_engine \
 	conf_applications conf_desks conf_desk conf_display \
@@ -239,7 +245,7 @@ SUBDIRS = ibar dropshadow clock pager battery cpufreq ibox start \
 	conf_window_display conf_window_focus conf_window_manipulation \
 	conf_menus conf_clientlist conf_dialogs conf_performance \
 	conf_winlist conf_exebuf conf_paths conf_mime conf_interaction \
-	$(am__append_1)
+	conf_window_remembers $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index c278639..6d1d3d2 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -26,5 +26,12 @@ module_la_LIBADD       = @e_libs@ @cf_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
+batgetdir = $(pkgdir)
+
+batget_PROGRAMS        = batget
+batget_SOURCES         = batget.c
+batget_LDFLAGS         = @BATTERY_LIBS@
+
+
 uninstall:
 	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/battery/Makefile.in b/src/modules/battery/Makefile.in
index dedb3c1..ceec6ac 100644
--- a/src/modules/battery/Makefile.in
+++ b/src/modules/battery/Makefile.in
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,6 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+batget_PROGRAMS = batget$(EXEEXT)
 subdir = src/modules/battery
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/module.desktop.in
@@ -58,11 +60,17 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"
+am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(batgetdir)" \
+	"$(DESTDIR)$(filesdir)"
 pkgLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkg_LTLIBRARIES)
 am_module_la_OBJECTS = e_mod_main.lo e_mod_config.lo
 module_la_OBJECTS = $(am_module_la_OBJECTS)
+batgetPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(batget_PROGRAMS)
+am_batget_OBJECTS = batget.$(OBJEXT)
+batget_OBJECTS = $(am_batget_OBJECTS)
+batget_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -74,8 +82,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(module_la_SOURCES)
-DIST_SOURCES = $(module_la_SOURCES)
+SOURCES = $(module_la_SOURCES) $(batget_SOURCES)
+DIST_SOURCES = $(module_la_SOURCES) $(batget_SOURCES)
 filesDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(files_DATA)
 ETAGS = etags
@@ -92,6 +100,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +114,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +134,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +161,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -264,6 +278,9 @@ module_la_SOURCES = e_mod_main.c \
 module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+batgetdir = $(pkgdir)
+batget_SOURCES = batget.c
+batget_LDFLAGS = @BATTERY_LIBS@
 all: all-am
 
 .SUFFIXES:
@@ -328,6 +345,37 @@ clean-pkgLTLIBRARIES:
 	done
 module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkgdir) $(module_la_LDFLAGS) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
+install-batgetPROGRAMS: $(batget_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(batgetdir)" || $(mkdir_p) "$(DESTDIR)$(batgetdir)"
+	@list='$(batget_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(batgetPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(batgetdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(batgetPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(batgetdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-batgetPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(batget_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(batgetdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(batgetdir)/$$f"; \
+	done
+
+clean-batgetPROGRAMS:
+	@list='$(batget_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+batget$(EXEEXT): $(batget_OBJECTS) $(batget_DEPENDENCIES) 
+	@rm -f batget$(EXEEXT)
+	$(LINK) $(batget_LDFLAGS) $(batget_OBJECTS) $(batget_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -335,6 +383,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/batget.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_config.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
 
@@ -463,9 +512,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(batgetdir)" "$(DESTDIR)$(filesdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -494,8 +543,8 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-batgetPROGRAMS clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -513,7 +562,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-filesDATA install-pkgLTLIBRARIES
+install-data-am: install-batgetPROGRAMS install-filesDATA \
+	install-pkgLTLIBRARIES
 
 install-exec-am:
 
@@ -541,22 +591,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-filesDATA uninstall-info-am \
-	uninstall-pkgLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkgLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-filesDATA install-info install-info-am \
-	install-man install-pkgLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-filesDATA \
+uninstall-am: uninstall-batgetPROGRAMS uninstall-filesDATA \
 	uninstall-info-am uninstall-pkgLTLIBRARIES
 
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-batgetPROGRAMS clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-batgetPROGRAMS install-data install-data-am \
+	install-exec install-exec-am install-filesDATA install-info \
+	install-info-am install-man install-pkgLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-batgetPROGRAMS uninstall-filesDATA uninstall-info-am \
+	uninstall-pkgLTLIBRARIES
+
 
 uninstall:
 	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
new file mode 100644
index 0000000..8266d17
--- /dev/null
+++ b/src/modules/battery/batget.c
@@ -0,0 +1,1521 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+#ifdef __FreeBSD__
+# include <sys/types.h>
+# include <sys/sysctl.h>
+# include <fcntl.h>
+# ifdef __i386__
+#  include <machine/apm_bios.h>
+# endif
+# include <stdio.h>
+#endif
+#ifdef HAVE_CFBASE_H
+# include <CFBase.h>
+# include <CFNumber.h>
+# include <CFArray.h>
+# include <CFDictionary.h>
+# include <CFRunLoop.h>
+# include <ps/IOPSKeys.h>
+# include <ps/IOPowerSources.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* supported batery system schemes - irrespective of OS */
+#define CHECK_NONE                    0
+#define CHECK_ACPI                    1
+#define CHECK_APM                     2
+#define CHECK_PMU                     3
+#define CHECK_SYS_CLASS_POWER_SUPPLY  4
+
+static void init(void);
+static int poll_cb(void *data);
+
+static int poll_interval = 512;
+static Ecore_Poller *poller = NULL;
+
+static int mode = CHECK_NONE;
+
+static int time_left = -2;
+static int battery_full = -2;
+static int have_battery = -2;
+static int have_power = -2;
+
+
+
+/* UTILS */
+static int
+int_file_get(const char *file)
+{
+   FILE *f;
+   int val = -1;
+   char buf[256];
+   
+   f = fopen(file, "r");
+   if (f)
+     {
+	fgets(buf, sizeof(buf), f);
+	val = atoi(buf);
+	fclose(f);
+     }
+   return val;
+}
+
+static char *
+str_file_get(const char *file)
+{
+   FILE *f;
+   char *val = NULL;
+   char buf[4096];
+   int len;
+   
+   f = fopen(file, "r");
+   if (f)
+     {
+	fgets(buf, sizeof(buf), f);
+	buf[sizeof(buf) - 1] = 0;
+	len = strlen(buf);
+	if (len > 0) buf[len - 1] = 0;
+	val = strdup(buf);
+	fclose(f);
+     }
+   return val;
+}
+
+static int
+int_get(char *buf)
+{
+   char *p, *q;
+   
+   p = strchr(buf, ':');
+   if (!p) return 0;
+   p++;
+   while (*p == ' ') p++;
+   q = p;
+   while ((*q != ' ') && (*q != '\n')) q++;
+   if (q) *q = 0;
+   return atoi(p);
+}
+
+static char *
+str_get(char *buf)
+{
+   char *p, *q;
+   
+   p = strchr(buf, ':');
+   if (!p) return NULL;
+   p++;
+   while (*p == ' ') p++;
+   q = p;
+   while ((*q) && (*q != ' ') && (*q != '\n')) q++;
+   if (q) *q = 0;
+   return strdup(p);
+}
+
+static int
+axtoi(char *arg)
+{
+   int n, val, pwr=1, m, rc = 0;
+   char hex[9], c;
+   
+   for (n = 0, m = 0; n < strlen(arg); n++)
+     {
+	if (arg[n] != ' ')
+	  {
+	     hex[m++] = c = toupper(arg[n]);
+	     if ((m == sizeof(hex)) || (c < '0') || (c > 'F'))
+	       return 0;   /* overflow or invalid */
+	  }
+     }
+   hex[m] = 0;  /* terminate string */
+   
+   for (n = 0; n < m; n++)
+     {
+	c = hex[m-n-1];
+	if ((c >= 'A') && (c <= 'F'))
+	  val = c -'A' + 10;
+	else
+	  val = c - '0';
+	rc = rc + val * pwr;
+	pwr *= 16;
+     }
+   return rc;
+}
+
+
+
+
+
+#ifdef __FreeBSD__
+
+#define BATTERY_STATE_NONE 0
+#define BATTERY_STATE_DISCHARGING 1
+#define BATTERY_STATE_CHARGING 2
+#define BATTERY_STATE_REMOVED 7
+
+/***---***/
+static void
+bsd_acpi_init(void)
+{
+   /* nothing to do */
+}
+
+static void
+bsd_acpi_check(void)
+{
+   int bat_val = 0;
+   int mib_state[4];
+   int mib_life[4];
+   int mib_time[4];
+   int mib_units[4];
+   size_t len;
+   int state = 0;
+   int level = 0;
+   int time_min = 0;
+   int life = 0;
+   int batteries = 0;
+   
+   time_left = -1;
+   battery_full = -1;
+   have_battery = 0;
+   have_power = 0;
+   
+   /* 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)
+     /* ERROR */
+     state = -1;
+   
+   len = 4;
+   sysctlnametomib("hw.acpi.battery.life", mib_life, &len);
+   len = sizeof(life);
+   if (sysctl(mib_life, 4, &life, &len, NULL, 0) == -1)
+     /* ERROR */
+     level = -1;
+   bat_val = life;
+   
+   len = 4;
+   sysctlnametomib("hw.acpi.battery.time", mib_time, &len);
+   len = sizeof(time);
+   if (sysctl(mib_time, 4, &time_min, &len, NULL, 0) == -1)
+     /* ERROR */
+     time_min = -1;
+   
+   len = 4;
+   sysctlnametomib("hw.acpi.battery.units", mib_units, &len);
+   len = sizeof(batteries);
+   if (sysctl(mib_time, 4, &batteries, &len, NULL, 0) == -1)
+     /* ERROR */
+     batteries = 1;
+   
+   if (time_min >= 0) time_left = time_min * 60;
+   
+   if (batteries == 1) /* hw.acpi.battery.units = 1 means NO BATTS */
+     time_left = -1;
+   else if ((state == BATTERY_STATE_CHARGING) ||
+	    (state == BATTERY_STATE_DISCHARGING))
+     {
+	have_battery = 1;
+	if (state == BATTERY_STATE_CHARGING) have_power = 1;
+	else if (state == BATTERY_STATE_DISCHARGING) have_power = 0;
+	if (level == -1) time_left = -1;
+	else if (time_min == -1)
+	  {
+	     time_left = -1;
+	     battery_full = bat_val;
+	  }
+	else battery_full = bat_val;
+     }
+   else
+     {
+	have_battery = 1;
+	battery_full = 100;
+	time_left = -1;
+	have_power = 1;
+     }
+}
+
+/***---***/
+static void
+bsd_apm_init(void)
+{
+   /* nothing to do */
+}
+
+static void
+bsd_apm_check(void)
+{
+   int  ac_stat, bat_stat, bat_val, time_val;
+   char buf[4096];
+   int  hours, minutes;
+   int apm_fd = -1;
+   struct apm_info info;
+   
+   time_left = -1;
+   battery_full = -1;
+   have_battery = 0;
+   have_power = 0;
+   
+   apm_fd = open("/dev/apm", O_RDONLY);
+   if ((apm_fd != -1) && (ioctl(apm_fd, APMIO_GETINFO, &info) != -1))
+     {
+	/* set values */
+	ac_stat = info.ai_acline;
+	bat_stat = info.ai_batt_stat;
+	bat_val = info.ai_batt_life;
+	time_val = info.ai_batt_time;
+     }
+   else return;
+   
+   if (info.ai_batteries == 1) /* ai_batteries == 1 means NO battery,
+				* ai_batteries == 2 means 1 battery */
+     {
+	have_power = 1;
+	return;
+     }
+   
+   if (ac_stat) /* Wallpowered */
+     {
+	have_power= 1;
+	have_battery = 1;
+	switch (bat_stat) /* On FreeBSD the time_val is -1 when AC ist plugged
+			   * in. This means we don't know how long the battery
+			   * will recharge */
+	  {
+	   case 0:
+	     battery_full = 100;
+	     break;
+	   case 1:
+	     battery_full = 50;
+	     break;
+	   case 2:
+	     battery_full = 25;
+	     break;
+	   case 3:
+	     battery_full = 100;
+	     break;
+	  }
+     }
+   else /* Running on battery */
+     {
+	have_battery = 1;
+	battery_full = bat_val;
+	time_left = time_val;
+     }
+}
+
+#elif defined(HAVE_CFBASE_H) /* OS X */
+/***---***/
+static void darwin_init(void);
+static void darwin_check(void);
+
+static void
+darwin_init(void)
+{
+   /* nothing to do */
+}
+
+static void
+darwin_check(void)
+{
+   const void *values;
+   int device_num, device_count;
+   int currentval = 0, maxval = 0;
+   char buf[4096];
+   CFTypeRef blob;
+   CFArrayRef sources;
+   CFDictionaryRef device_dict;
+
+   time_left = -1;
+   battery_full = -1;
+   have_battery = 0;
+   have_power = 0;
+   
+   /* Retrieve the power source data and the array of sources. */
+   blob = IOPSCopyPowerSourcesInfo();
+   sources = IOPSCopyPowerSourcesList(blob);
+   device_count = CFArrayGetCount(sources);
+   for (device_num = 0; device_num < device_count; device_num++)
+     {
+	CFTypeRef ps;
+	
+	/* Retrieve a dictionary of values for this device and the count of keys in the dictionary. */
+	ps = CFArrayGetValueAtIndex(sources, device_num);
+	device_dict = IOPSGetPowerSourceDescription(blob, ps);
+	/* Retrieve the charging key and save the present charging value if one exists. */
+	if (CFDictionaryGetValueIfPresent(device_dict, 
+					  CFSTR(kIOPSIsChargingKey), &values))
+	  {
+	     have_battery = 1;
+	     if (CFBooleanGetValue(values) > 0) have_power = 1;
+	     break;
+	  }
+	
+     }
+   
+   if (!have_battery)
+     {
+	CFRelease(sources);
+	CFRelease(blob);
+	have_power = 1;
+	return;
+     }
+   
+   /* Retrieve the current capacity key. */
+   values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSCurrentCapacityKey));
+   CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
+   /* Retrieve the max capacity key. */
+   values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSMaxCapacityKey));
+   CFNumberGetValue(values, kCFNumberSInt32Type, &maxval);
+   /* Calculate the percentage charged. */
+   battery_full = (currentval * 100) / maxval;
+   
+   /* Retrieve the remaining battery power or time until charged in minutes. */
+   if (!have_power)
+     {
+	values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSTimeToEmptyKey));
+	CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
+	time_left = currentval * 60;
+     }
+   else
+     {
+	values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSTimeToFullChargeKey));
+	CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
+	time_left = currentval * 60;
+     }
+   CFRelease(sources);
+   CFRelease(blob);
+}
+#else
+
+
+
+
+
+
+
+
+/***---***/
+/* new linux power class api to get power info - brand new and this code
+ * may have bugs, but it is a good attempt to get it right */
+static int linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
+static void linux_sys_class_power_supply_init(void);
+static void linux_sys_class_power_supply_check(void);
+typedef struct _Sys_Class_Power_Supply_Uevent Sys_Class_Power_Supply_Uevent;
+
+#define BASIS_CHARGE  1
+#define BASIS_ENERGY  2
+#define BASIS_VOLTAGE 3
+
+struct _Sys_Class_Power_Supply_Uevent
+{
+   char *name;
+   int fd;
+   Ecore_Fd_Handler *fd_handler;
+   
+   int present;
+
+   int basis;
+   int basis_empty;
+   int basis_full;
+
+   unsigned char have_current_avg : 1;
+   unsigned char have_current_now : 1;
+};
+
+static Ecore_List *events = NULL;
+static Ecore_Timer *sys_class_delay_check = NULL;
+
+static int
+linux_sys_class_powe_supply_cb_delay_check(void *data)
+{
+   linux_sys_class_power_supply_init();
+   poll_cb(NULL);
+   sys_class_delay_check = NULL;
+   return 0;
+}
+
+static Ecore_Timer *re_init_timer = NULL;
+
+static int
+linux_sys_class_powe_supply_cb_re_init(void *data)
+{
+   Sys_Class_Power_Supply_Uevent *sysev;
+   
+   if (events)
+     {
+	while ((sysev = ecore_list_first_goto(events)))
+	  {
+	     ecore_list_remove(events);
+	     
+	     if (sysev->fd_handler)
+	       ecore_main_fd_handler_del(sysev->fd_handler);
+	     if (sysev->fd >= 0) close(sysev->fd);
+	     free(sysev->name);
+	     free(sysev);
+	  }
+	ecore_list_destroy(events);
+	events = NULL;
+     }
+   linux_sys_class_power_supply_init();
+   re_init_timer = NULL;
+   return 0;
+}     
+
+static int
+linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler)
+{
+   Sys_Class_Power_Supply_Uevent *sysev;
+   
+   sysev = data;
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
+     {
+	int lost = 0;
+	for (;;)
+	  {
+	     char buf[1024];
+	     int num;
+	     
+	     if ((num = read(sysev->fd, buf, sizeof(buf))) < 1)
+	       {
+		  lost = ((errno == EIO) ||
+			  (errno == EBADF) ||
+			  (errno == EPIPE) ||
+			  (errno == EINVAL) ||
+			  (errno == ENOSPC) ||
+			  (errno == ENODEV));
+		  if (num <= 0) break;
+	       }
+	  }
+	if (lost)
+	  {
+	     ecore_list_goto(events, sysev);
+	     ecore_list_remove(events);
+	     
+	     if (sysev->fd_handler)
+	       ecore_main_fd_handler_del(sysev->fd_handler);
+	     if (sysev->fd >= 0) close(sysev->fd);
+	     free(sysev->name);
+	     free(sysev);
+	     
+	     if (re_init_timer) ecore_timer_del(re_init_timer);
+	     re_init_timer = ecore_timer_add(1.0, linux_sys_class_powe_supply_cb_re_init, NULL);
+	  }
+	else
+	  {
+	     if (sys_class_delay_check) ecore_timer_del(sys_class_delay_check);
+	     sys_class_delay_check = ecore_timer_add(0.2, linux_sys_class_powe_supply_cb_delay_check, NULL);
+	  }
+     }
+   return 1;
+}
+
+static void
+linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev)
+{
+   char buf[4096];
+   
+   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);
+   sysev->present = int_file_get(buf);
+   if (!sysev->present) return;
+   
+   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_avg", 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);
+   if (ecore_file_exists(buf)) sysev->have_current_now = 1;
+
+   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_full", 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);
+   if (ecore_file_exists(buf)) sysev->basis = BASIS_VOLTAGE;
+   
+   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_full", 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);
+   if (ecore_file_exists(buf)) sysev->basis = BASIS_ENERGY;
+   
+   snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_full", 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);
+   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);
+	sysev->basis_full = int_file_get(buf);
+	snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/charge_empty", 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);
+	     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);
+	     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);
+	sysev->basis_full = int_file_get(buf);
+	snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_empty", 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);
+	     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);
+	     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);
+	sysev->basis_full = int_file_get(buf);
+	snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_empty", 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);
+	     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);
+	     sysev->basis_empty = int_file_get(buf);
+	  }
+     }
+}
+
+static void
+linux_sys_class_power_supply_init(void)
+{
+   if (events)
+     {
+	Sys_Class_Power_Supply_Uevent *sysev;
+	
+        ecore_list_first_goto(events);
+	while ((sysev = ecore_list_next(events)))
+	  linux_sys_class_power_supply_sysev_init(sysev);
+     }
+   else
+     {
+	Ecore_List *bats;
+	char *name;
+	char buf[4096];
+	
+	bats = ecore_file_ls("/sys/class/power_supply/");
+	if (bats)
+	  {
+	     events = ecore_list_new();
+	     while ((name = ecore_list_next(bats)))
+	       {
+		  Sys_Class_Power_Supply_Uevent *sysev;
+	     
+		  if (strncasecmp("bat", name, 3)) continue;
+		  sysev = E_NEW(Sys_Class_Power_Supply_Uevent, 1);
+		  sysev->name = strdup(name);
+		  snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/uevent", name);
+		  sysev->fd = open(buf, O_RDONLY);
+		  if (sysev->fd >= 0)
+		    sysev->fd_handler = ecore_main_fd_handler_add(sysev->fd,
+								  ECORE_FD_READ,
+								  linux_sys_class_power_supply_cb_event_fd_active,
+								  sysev,
+								  NULL, NULL);
+		  ecore_list_append(events, sysev);
+		  linux_sys_class_power_supply_sysev_init(sysev);
+	       }
+	     ecore_list_destroy(bats);
+	  }
+     }
+}
+
+static void
+linux_sys_class_power_supply_check(void)
+{
+   char *name;
+   char buf[4096];
+   
+   battery_full = -1;
+   time_left = -1;
+   have_battery = 0;
+   have_power = 0;
+
+   if (events)
+     {
+	Sys_Class_Power_Supply_Uevent *sysev;
+	int total_pwr_now;
+	int total_pwr_max;
+	int nofull = 0;
+	
+	total_pwr_now = 0;
+	total_pwr_max = 0;
+	time_left = 0;
+	ecore_list_first_goto(events);
+	while ((sysev = ecore_list_next(events)))
+	  {
+	     char *tmp;
+	     int present = 0;
+	     int charging = -1;
+	     int capacity = -1;
+	     int current = -1;
+	     int time_to_full = -1;
+	     int time_to_empty = -1;
+	     int full = -1;
+	     int pwr_now = -1;
+	     int pwr_empty = -1;
+	     int pwr_full = -1;
+	     int pwr = 0;
+	     
+	     name = sysev->name;
+	     
+	     /* fetch more generic info */
+	     // init
+	     present = sysev->present;
+	     if (!present) continue;
+	     
+	     snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/capacity", name);
+	     capacity = int_file_get(buf);
+	     if (sysev->have_current_avg)
+	       {
+		  snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_avg", name);
+		  current = int_file_get(buf);
+	       }
+	     else if (sysev->have_current_now)
+	       {
+		  snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/current_now", 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);
+	     tmp = str_file_get(buf);
+	     if (tmp)
+	       {
+		  full = 0;
+		  if (!strncasecmp("discharging", tmp, 11)) charging = 0;
+		  else if (!strncasecmp("charging", tmp, 8)) charging = 1;
+		  else if (!strncasecmp("full", tmp, 4))
+		    {
+		       full = 1;
+		       charging = 0;
+		    }
+		  free(tmp);
+	       }
+	     /* some batteries can/will/want to predict how long they will
+	      * last. if so - take what the battery says. too bad if it's
+	      * wrong. that's a buggy battery or driver */
+	     if (!full)
+	       {
+		  nofull++;
+		  if (charging)
+		    {
+		       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/time_to_full_now", name);
+		       time_to_full = int_file_get(buf);
+		    }
+		  else
+		    {
+		       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/time_to_empty_now", name);
+		       time_to_empty = int_file_get(buf);
+		    }
+	       }
+	     
+	     /* 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);
+             else if (sysev->basis == BASIS_ENERGY)
+	       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/energy_now", name);
+	     else if (sysev->basis == BASIS_VOLTAGE)
+	       snprintf(buf, sizeof(buf), "/sys/class/power_supply/%s/voltage_now", 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 (pwr_now < 0) 
+		    pwr_now = (((long long)capacity * ((long long)pwr_full - (long long)pwr_empty)) / 100) + pwr_empty;
+	       }
+	     
+	     if (sysev->present) have_battery = 1;
+	     if (charging)
+	       {
+		  pwr_now = pwr_now;
+		  have_power = 1;
+		  if (time_to_full >= 0)
+		    {
+		       if (time_to_full > time_left)
+			 time_left = time_to_full;
+		    }
+		  else
+		    {
+		       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)
+			 {
+			    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;
+	  }
+	if (total_pwr_max > 0)
+	  battery_full = ((long long)total_pwr_now * 100) / total_pwr_max;
+	if (nofull == 0)
+	  time_left = -1;
+     }
+}
+
+
+
+
+
+
+
+
+
+/***---***/
+/* "here and now" ACPI based power checking. is there for linux and most
+ * modern laptops. as of linux 2.6.24 it is replaced with 
+ * linux_sys_class_power_supply_init/check() though as this is the new
+ * power class api to poll for power stuff
+ */
+static int linux_acpi_cb_acpid_add(void *data, int type, void *event);
+static int linux_acpi_cb_acpid_del(void *data, int type, void *event);
+static int linux_acpi_cb_acpid_data(void *data, int type, void *event);
+static void linux_acpi_init(void);
+static void linux_acpi_check(void);
+
+static int acpi_max_full = -1;
+static int acpi_max_design = -1;
+static Ecore_Con_Server *acpid = NULL;
+static Ecore_Event_Handler *acpid_handler_add = NULL;
+static Ecore_Event_Handler *acpid_handler_del = NULL;
+static Ecore_Event_Handler *acpid_handler_data = NULL;
+static Ecore_Timer *delay_check = NULL;
+static int event_fd = -1;
+static Ecore_Fd_Handler *event_fd_handler = NULL;
+
+static int
+linux_acpi_cb_delay_check(void *data)
+{
+   linux_acpi_init();
+   poll_cb(NULL);
+   delay_check = NULL;
+   return 0;
+}
+
+static int
+linux_acpi_cb_acpid_add(void *data, int type, void *event)
+{
+   return 1;
+}
+
+static int
+linux_acpi_cb_acpid_del(void *data, int type, void *event)
+{
+   ecore_con_server_del(acpid);
+   acpid = NULL;
+   if (acpid_handler_add) ecore_event_handler_del(acpid_handler_add);
+   acpid_handler_add = NULL;
+   if (acpid_handler_del) ecore_event_handler_del(acpid_handler_del);
+   acpid_handler_del = NULL;
+   if (acpid_handler_data) ecore_event_handler_del(acpid_handler_data);
+   acpid_handler_data = NULL;
+   return 1;
+}
+
+static int
+linux_acpi_cb_acpid_data(void *data, int type, void *event)
+{
+   Ecore_Con_Event_Server_Data *ev;
+   
+   ev = event;
+   if (delay_check) ecore_timer_del(delay_check);
+   delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
+   return 1;
+}
+
+static int
+linux_acpi_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler)
+{
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
+     {
+	int lost = 0;
+	for (;;)
+	  {
+	     char buf[1024];
+	     int num;
+	     
+	     if ((num = read(event_fd, buf, sizeof(buf))) < 1)
+	       {
+		  lost = ((errno == EIO) ||
+			  (errno == EBADF) ||
+			  (errno == EPIPE) ||
+			  (errno == EINVAL) ||
+			  (errno == ENOSPC));
+		  if (num == 0) break;
+	       }
+	  }
+	if (lost)
+	  {
+	     ecore_main_fd_handler_del(event_fd_handler);
+	     event_fd_handler = NULL;
+	     close(event_fd);
+	     event_fd = -1;
+	  }
+	else
+	  {
+	     if (delay_check) ecore_timer_del(delay_check);
+	     delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
+	  }
+     }
+   return 1;
+}
+
+static void
+linux_acpi_init(void)
+{
+   Ecore_List *powers;
+   Ecore_List *bats;
+
+   bats = ecore_file_ls("/proc/acpi/battery");
+   if (bats)
+     {
+	char *name;
+
+	have_power = 0;
+	powers = ecore_file_ls("/proc/acpi/ac_adapter");
+	if (powers)
+	  {
+	     char *name;
+	     while ((name = ecore_list_next(powers)))
+	       {
+		  char buf[4096];
+		  FILE *f;
+		  
+		  snprintf(buf, sizeof(buf), "/proc/acpi/ac_adapter/%s/state", name);
+		  f = fopen(buf, "r");
+		  if (f)
+		    {
+		       char *tmp;
+		       
+		       /* state */
+		       fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+		       tmp = str_get(buf);
+		       if (tmp)
+			 {
+			    if (!strcmp(tmp, "on-line")) have_power = 1;
+			    free(tmp);
+			 }
+		    }
+	       }
+	     ecore_list_destroy(powers);
+	  }
+   
+	have_battery = 0;
+	acpi_max_full = 0;
+	acpi_max_design = 0;
+	while ((name = ecore_list_next(bats)))
+	  {
+	     char buf[4096];
+	     FILE *f;
+	     
+             snprintf(buf, sizeof(buf), "/proc/acpi/battery/%s/info", name);
+	     f = fopen(buf, "r");
+	     if (f)
+	       {
+		  char *tmp;
+		  
+		  /* present */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+		  tmp = str_get(buf);
+		  if (tmp)
+		    {
+		       if (!strcmp(tmp, "yes")) have_battery = 1;
+		       free(tmp);
+		    }
+		  /* design cap */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+		  tmp = str_get(buf);
+		  if (tmp)
+		    {
+		       if (strcmp(tmp, "unknown")) acpi_max_design += atoi(tmp);
+		       free(tmp);
+		    }
+		  /* last full cap */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+		  tmp = str_get(buf);
+		  if (tmp)
+		    {
+		       if (strcmp(tmp, "unknown")) acpi_max_full += atoi(tmp);
+		       free(tmp);
+		    }
+		  fclose(f);
+	       }
+	  }
+        ecore_list_destroy(bats);
+     }
+   if (!acpid)
+     {
+	acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, 
+				      "/var/run/acpid.socket", -1, NULL);
+	if (acpid)
+	  {
+	     acpid_handler_add = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, 
+							 linux_acpi_cb_acpid_add, NULL);
+	     acpid_handler_del = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, 
+							 linux_acpi_cb_acpid_del, NULL);
+	     acpid_handler_data = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, 
+							  linux_acpi_cb_acpid_data, NULL);
+	  }
+	else
+	  {
+	     if (event_fd < 0)
+	       {
+		  event_fd = open("/proc/acpi/event", O_RDONLY);
+		  if (event_fd >= 0)
+		    event_fd_handler = ecore_main_fd_handler_add(event_fd,
+								 ECORE_FD_READ,
+								 linux_acpi_cb_event_fd_active,
+								 NULL,
+								 NULL, NULL);
+	       }
+	  }
+     }
+}
+
+static void
+linux_acpi_check(void)
+{
+   Ecore_List *bats;
+
+   battery_full = -1;
+   time_left = -1;
+   have_battery = 0;
+   have_power = 0;
+
+   bats = ecore_file_ls("/proc/acpi/battery");
+   if (bats)
+     {
+	char *name;
+	int rate = 0;
+	int capacity = 0;
+	
+        while ((name = ecore_list_next(bats)))
+	  {
+	     char buf[4096];
+	     FILE *f;
+	     
+	     snprintf(buf, sizeof(buf), "/proc/acpi/battery/%s/state", name);
+	     f = fopen(buf, "r");
+	     if (f)
+	       {
+		  char *tmp;
+		  
+                  /* present */
+		  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+		  tmp = str_get(buf);
+		  if (tmp)
+		    {
+		       if (!strcmp(tmp, "yes")) have_battery = 1;
+		       free(tmp);
+		    }
+		  /* capacity state: ok/? */
+		  fgets(buf, sizeof(buf), f);
+		  /* charging state: charging/? */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+                  tmp = str_get(buf);
+                  if (tmp)
+		    {
+		       if (have_power == 0)
+			 {
+			    if (!strcmp(tmp, "charging")) have_power = 1;
+			 }
+		       free(tmp);
+		    }
+		  /* present rate: unknown/NNN */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+                  tmp = str_get(buf);
+                  if (tmp)
+		    {
+		       if (strcmp(tmp, "unknown")) rate += atoi(tmp);
+		       free(tmp);
+		    }
+		  /* remaining capacity: NNN */
+                  fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+                  tmp = str_get(buf);
+                  if (tmp)
+		    {
+		       if (strcmp(tmp, "unknown")) capacity += atoi(tmp);
+		       free(tmp);
+		    }
+		  fclose(f);
+	       }
+	  }
+        ecore_list_destroy(bats);
+	if (acpi_max_full > 0)
+	  battery_full = 100 * (long long)capacity / acpi_max_full;
+	else if (acpi_max_design > 0)
+	  battery_full = 100 * (long long)capacity / acpi_max_design;
+	else
+	  battery_full = -1;
+	if (rate <= 0) time_left = -1;
+	else 
+	  {
+	     if (have_power)
+	       time_left = (3600 * ((long long)acpi_max_full - (long long)capacity)) / rate;
+	     else
+	       time_left = (3600 * (long long)capacity) / rate;
+	  }
+     }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/***---***/
+/* old school apm support - very old laptops and some devices support this.
+ * this is here for legacy support and i wouldn't suggest spending any
+ * effort on it as it is complete below as best i know, but could have missed
+ * one or 2 things, but not worth fixing */
+static void linux_apm_init(void);
+static void linux_apm_check(void);
+    
+static void
+linux_apm_init(void)
+{
+   /* nothing to do */
+}
+
+static void
+linux_apm_check(void)
+{
+   FILE *f;
+   char s[256], s1[32], s2[32], s3[32];
+   int  apm_flags, ac_stat, bat_stat, bat_flags, bat_val, time_val;
+   
+   battery_full = -1;
+   time_left = -1;
+   have_battery = 0;
+   have_power = 0;
+   
+   f = fopen("/proc/apm", "r");
+   if (!f) return;
+   
+   fgets(s, sizeof(s), f); s[sizeof(s) - 1] = 0;
+   if (sscanf(s, "%*s %*s %x %x %x %x %s %s %s",
+	      &apm_flags, &ac_stat, &bat_stat, &bat_flags, s1, s2, s3) != 7)
+     {
+	fclose(f);
+	return;
+     }
+   s1[strlen(s1) - 1] = 0;
+   bat_val = atoi(s1);
+   if (!strcmp(s3, "sec")) time_val = atoi(s2);
+   else if (!strcmp(s3, "min")) time_val = atoi(s2) * 60;
+   fclose(f);
+   
+   if ((bat_flags != 0xff) && (bat_flags & 0x80))
+     {
+	have_battery = 0;
+	have_power = 0;
+	battery_full = 100;
+	time_left = 0;
+	return;
+     }
+   
+   if (bat_val >= 0)
+     {
+	have_battery = 1;
+	have_power = ac_stat;
+	battery_full = bat_val;
+	if (battery_full > 100) battery_full = 100;
+	if (ac_stat == 1) time_left = -1;
+	else time_left = time_val;
+     }
+   else
+     {
+	switch (bat_stat)
+	  {
+	   case 0: /* high */
+	     have_battery = 1;
+	     have_power = ac_stat;
+	     battery_full = 100;
+	     time_left = -1;
+	     break;
+	   case 1: /* medium */
+	     have_battery = 1;
+	     have_power = ac_stat;
+	     battery_full = 50;
+	     time_left = -1;
+	     break;
+	   case 2: /* low */
+	     have_battery = 1;
+	     have_power = ac_stat;
+	     battery_full = 25;
+	     time_left = -1;
+	     break;
+	   case 3: /* charging */
+	     have_battery = 1;
+	     have_power = ac_stat;
+	     battery_full = 100;
+	     time_left = -1;
+	     break;
+	  }
+     }
+}
+
+
+
+
+
+
+
+
+
+/***---***/
+/* for older mac powerbooks. legacy as well like linux_apm_init/check. leave
+ * it alone unless you have to touch it */
+static void linux_pmu_init(void);
+static void linux_pmu_check(void);
+
+static void
+linux_pmu_init(void)
+{
+   /* nothing to do */
+}
+
+static void
+linux_pmu_check(void)
+{
+   FILE *f;
+   char buf[4096];
+   Ecore_List *bats;
+   char *name;
+   int ac = 0;
+   int flags = 0;
+   int charge = 0;
+   int max_charge = 0;
+   int voltage = 0;
+   int seconds = 0;
+   int curcharge = 0;
+   int curmax = 0;
+   
+   f = fopen("/proc/pmu/info", "r");
+   if (f)
+     {
+	/* Skip driver */
+	fgets(buf, sizeof(buf), f);
+	/* Skip firmware */
+	fgets(buf, sizeof(buf), f);
+	/* Read ac */
+	fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0;
+	ac = int_get(buf);
+	fclose(f);
+     }
+   bats = ecore_file_ls("/proc/pmu");
+   if (bats)
+     {
+	have_battery = 1;
+	have_power = ac;
+	while ((name = ecore_list_next(bats)))
+	  {
+	     if (strncmp(name, "battery", 7)) continue;
+	     snprintf(buf, sizeof(buf), "/proc/pmu/%s", name);
+	     f = fopen(buf, "r");
+	     if (f)
+	       {
+                  int timeleft = 0;
+		  int current = 0;
+		  
+		  while (fgets(buf,sizeof (buf), f))
+		    {
+		       char *token;
+		       
+		       if ((token = strtok(buf, ":")))
+			 {
+			    if (!strncmp("flags", token, 5))
+			      flags = axtoi(strtok (0, ": "));
+			    else if (!strncmp("charge", token, 6))
+			      charge = atoi(strtok(0, ": "));
+			    else if (!strncmp("max_charge", token, 9))
+			      max_charge = atoi(strtok(0, ": "));
+			    else if (!strncmp("current", token, 7))
+			      current = atoi(strtok(0, ": "));
+			    else if (!strncmp("time rem", token, 8))
+			      timeleft = atoi(strtok(0, ": "));
+			    else if (!strncmp("voltage", token, 7))
+			      voltage = atoi(strtok(0, ": "));
+			    else
+			      strtok(0, ": ");
+			 }
+		    }
+		  curmax += max_charge;
+		  curcharge += charge;
+		  fclose(f);
+                  if (!current)
+		    {
+		       /* Neither charging nor discharging */
+		    }
+		  else if (!ac)
+		    {
+		       /* When on dc, we are discharging */
+		       seconds += timeleft;
+		    }
+		  else
+		    {
+		       /* Charging - works in paralell */
+		       seconds = MAX(timeleft, seconds);
+		    }
+	       }
+	  }
+        ecore_list_destroy(bats);
+	if (max_charge > 0) battery_full = ((long long)charge * 100) / max_charge;
+	else battery_full = 0;
+	time_left = seconds;
+     }
+   else
+     {
+	have_power = ac;
+	have_battery = 0;
+	battery_full = -1;
+	time_left = -1;
+     }
+}
+#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+static int
+dir_has_contents(const char *dir)
+{
+   Ecore_List *bats;
+   char *name;
+	
+   bats = ecore_file_ls(dir);
+   if (bats)
+     {
+	int count;
+	
+	count = ecore_list_count(bats);
+	ecore_list_destroy(bats);
+	if (count > 0) return 1;
+     }
+   return 0;
+}
+
+static void
+init(void)
+{
+#ifdef __FreeBSD__
+   int acline;
+   size_t len;
+   
+   len = sizeof(acline);
+   if (!sysctlbyname("hw.acpi.acline", &acline, &len, NULL, 0))
+     {
+	int acline_mib[3] = {-1};
+	
+	len = 3;
+	if (!sysctlnametomib("hw.acpi.acline", acline_mib, &len))
+	  {
+	     mode = CHECK_ACPI;
+	     bsd_acpi_init();
+	  }
+     }
+   else
+     {
+	if (ecore_file_exists("/dev/apm"))
+	  {
+	     mode = CHECK_APM;
+	     bsd_apm_init();
+	  }
+     }
+#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")))
+     {
+	mode = CHECK_SYS_CLASS_POWER_SUPPLY;
+	linux_sys_class_power_supply_init();
+     }
+   else if (ecore_file_is_dir("/proc/acpi")) /* <= 2.6.24 */
+     {
+	mode = CHECK_ACPI;
+	linux_acpi_init();
+     }
+   else if (ecore_file_exists("/proc/apm"))
+     {
+	mode = CHECK_APM;
+	linux_apm_init();
+     }
+   else if (ecore_file_is_dir("/proc/pmu"))
+     {
+	mode = CHECK_PMU;
+	linux_pmu_init();
+     }
+#endif
+}
+
+static int
+poll_cb(void *data)
+{
+   int ptime_left;
+   int pbattery_full;
+   int phave_battery;
+   int phave_power;
+   
+   ptime_left = time_left;
+   pbattery_full = battery_full;
+   phave_battery = have_battery;
+   phave_power = have_power;
+   
+#ifdef __FreeBSD__
+   switch (mode)
+     {
+      case CHECK_ACPI:
+       bsd_acpi_check();
+	break;
+      case CHECK_APM:
+	bsd_apm_check();
+	break;
+      default:
+	battery_full = -1;
+	time_left = -1;
+	have_battery = 0;
+	have_power = 0;
+	break;
+     }
+#elif defined(HAVE_CFBASE_H) /* OS X */
+   darwin_check();
+   break;
+#else
+   switch (mode)
+     {
+      case CHECK_ACPI:
+	linux_acpi_check();
+	break;
+      case CHECK_APM:
+	linux_apm_check();
+	break;
+      case CHECK_PMU:
+	linux_pmu_check();
+	break;
+      case CHECK_SYS_CLASS_POWER_SUPPLY:
+	linux_sys_class_power_supply_check();
+	break;
+      default:
+	battery_full = -1;
+	time_left = -1;
+	have_battery = 0;
+	have_power = 0;
+	break;
+     }
+#endif	
+   if ((ptime_left    != time_left) ||
+       (pbattery_full != battery_full) ||
+       (phave_battery != have_battery) ||
+       (phave_power   != have_power))
+     {
+	if ((time_left < 0) && 
+	    ((have_battery) && (battery_full < 0)))
+	  printf("ERROR\n");
+	else
+	  printf("%i %i %i %i\n", 
+		 battery_full, time_left, have_battery, have_power);
+	fflush(stdout);
+     }
+   return 1;
+}
+
+int
+main(int argc, char *argv[])
+{
+   if (argc != 2)
+     {
+	printf("ARGS INCORRECT!\n");
+	return 0;
+     }
+   poll_interval = atoi(argv[1]);
+   
+   ecore_init();
+   ecore_file_init();
+   ecore_con_init();
+   
+   init();
+   poller = ecore_poller_add(ECORE_POLLER_CORE, poll_interval, poll_cb, NULL);
+   poll_cb(NULL);
+   
+   ecore_main_loop_begin();
+   
+   ecore_con_shutdown();
+   ecore_file_shutdown();
+   ecore_shutdown();
+   
+   return 0;
+}
diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index a276a4b..e4aaaaf 100644
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -3,10 +3,12 @@
 
 struct _E_Config_Dialog_Data
 {
-   int show_alert;   
+   int show_alert;
    int poll_interval;
-   int alarm_time;
-   int alarm_percent;
+   int alert_time;
+   int alert_percent;
+   int dismiss_alert;
+   int alert_timeout;
 };
 
 /* Protos */
@@ -46,13 +48,20 @@ static void
 _fill_data(E_Config_Dialog_Data *cfdata) 
 {
    if (!battery_config) return;
-   cfdata->alarm_time = battery_config->alarm;
-   cfdata->alarm_percent = battery_config->alarm_p;
+   cfdata->alert_time = battery_config->alert;
+   cfdata->alert_percent = battery_config->alert_p;
    cfdata->poll_interval = battery_config->poll_interval;
-   if (cfdata->alarm_time > 0 || cfdata->alarm_percent > 0) 
+   cfdata->alert_timeout = battery_config->alert_timeout;
+
+   if (cfdata->alert_time > 0 || cfdata->alert_percent > 0) 
      cfdata->show_alert = 1;
    else 
      cfdata->show_alert = 0;
+   
+   if (cfdata->alert_timeout > 0)
+     cfdata->dismiss_alert = 1;
+   else
+     cfdata->dismiss_alert = 0;
 }
 
 static void *
@@ -90,16 +99,23 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    if (!battery_config) return 0;
+
    if (cfdata->show_alert)
-   { 
-     battery_config->alarm = cfdata->alarm_time;
-     battery_config->alarm_p = cfdata->alarm_percent;
-   }
+     { 
+        battery_config->alert = cfdata->alert_time;
+        battery_config->alert_p = cfdata->alert_percent;
+     }
    else
-   { 
-     battery_config->alarm = 0;
-     battery_config->alarm_p = 0;
-   }
+     { 
+        battery_config->alert = 0;
+        battery_config->alert_p = 0;
+     }
+
+   if (cfdata->dismiss_alert)
+     battery_config->alert_timeout = cfdata->alert_timeout;
+   else
+     battery_config->alert_timeout = 0;
+   
    _battery_config_updated();
    e_config_save_queue();
    return 1;
@@ -117,7 +133,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_label_add(evas, _("Check battery every:"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
    
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0, NULL, &(cfdata->poll_interval), 200);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0, NULL, &(cfdata->poll_interval), 256);
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
    
    ob = e_widget_check_add(evas, _("Show alert when battery is low"), &(cfdata->show_alert));
@@ -126,11 +142,20 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_label_add(evas, _("Alert when battery is down to:"));
    e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 0, 1, 1);
    
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1, 60, 1, 0, NULL, &(cfdata->alarm_time), 200);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 0, 60, 1, 0, NULL, &(cfdata->alert_time), 60);
    e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 0, 1, 0);
 
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f percent"), 1, 100, 1, 0, NULL, &(cfdata->alarm_percent), 200);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f percent"), 0, 100, 1, 0, NULL, &(cfdata->alert_percent), 100);
    e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0);
+   
+   ob = e_widget_check_add(evas, _("Dismiss alert automatically"), &(cfdata->dismiss_alert));
+   e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 0);   
+   
+   ob = e_widget_label_add(evas, _("Dismiss alert after:"));
+   e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 0, 1, 0);
+   
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1, 300, 1, 0, NULL, &(cfdata->alert_timeout), 150);
+   e_widget_frametable_object_append(of, ob, 0, 8, 1, 1, 1, 0, 1, 0);
 
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    return o;
@@ -140,17 +165,25 @@ static int
 _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    if (!battery_config) return 0;
+
    battery_config->poll_interval = cfdata->poll_interval;
+
    if (cfdata->show_alert)
-   { 
-     battery_config->alarm = cfdata->alarm_time;
-     battery_config->alarm_p = cfdata->alarm_percent;
-   }
+     { 
+        battery_config->alert = cfdata->alert_time;
+        battery_config->alert_p = cfdata->alert_percent;
+     }
    else 
-   {
-     battery_config->alarm = 0;
-     battery_config->alarm_p = 0;
-   }
+     {
+        battery_config->alert = 0;
+        battery_config->alert_p = 0;
+     }
+
+   if (cfdata->dismiss_alert)
+     battery_config->alert_timeout = cfdata->alert_timeout;
+   else
+     battery_config->alert_timeout = 0;
+
    _battery_config_updated();
    e_config_save_queue();
    return 1;
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 35ebfac..41b75d4 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -4,27 +4,8 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-#ifdef __FreeBSD__
-# include <sys/types.h>
-# include <sys/sysctl.h>
-# include <fcntl.h>
-# ifdef __i386__
-#  include <machine/apm_bios.h>
-# endif
-# include <stdio.h>
-#endif
-#ifdef HAVE_CFBASE_H
-#include <CFBase.h>
-#include <CFNumber.h>
-#include <CFArray.h>
-#include <CFDictionary.h>
-#include <CFRunLoop.h>
-#include <ps/IOPSKeys.h>
-#include <ps/IOPowerSources.h>
-#endif
-
-/***************************************************************************/
-/**/
+#define POPUP_DEBOUNCE_CYCLES  2
+
 /* 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);
@@ -32,6 +13,7 @@ static void _gc_orient(E_Gadcon_Client *gcc);
 static char *_gc_label(void);
 static Evas_Object *_gc_icon(Evas *evas);
 static const char *_gc_id_new(void);
+
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
@@ -42,39 +24,32 @@ static const E_Gadcon_Client_Class _gadcon_class =
      },
    E_GADCON_CLIENT_STYLE_PLAIN
 };
-/**/
-/***************************************************************************/
 
-/***************************************************************************/
-/**/
 /* actual module specifics */
-
 typedef struct _Instance Instance;
 
 struct _Instance
 {
    E_Gadcon_Client *gcc;
    Evas_Object     *o_battery;
+   Evas_Object     *popup_battery;
+   E_Gadcon_Popup  *warning;
 };
 
+static int _battery_cb_exe_data(void *data, int type, void *event);
+static int _battery_cb_exe_del(void *data, int type, void *event);
 static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _menu_cb_post(void *data, E_Menu *m);
-static Status *_battery_linux_acpi_check(void);
-static Status *_battery_linux_apm_check(void);
-static Status *_battery_linux_powerbook_check(void);
-#ifdef __FreeBSD__
-static Status *_battery_bsd_acpi_check(void);
-static Status *_battery_bsd_apm_check(void);
-#endif
-#ifdef HAVE_CFBASE_H
-static Status *_battery_darwin_check(void);
-#endif
-static void _battery_face_level_set(Instance *inst, double level);
-static int _battery_int_get(char *buf);
-static char *_battery_string_get(char *buf);
-static int _battery_cb_check(void *data);
+static void _battery_face_level_set(Evas_Object *battery, double level);
+static void _battery_face_time_set(Evas_Object *battery, int time);
 static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
 
+static int  _battery_cb_warning_popup_timeout(void *data);
+static void _battery_cb_warning_popup_hide(void *data, Evas *e, Evas_Object *obj, void *event);
+static void _battery_warning_popup_resize(Evas_Object *obj, int *w, int *h);
+static void _battery_warning_popup_destroy(Instance *inst);
+static void _battery_warning_popup(Instance *inst, int time, double percent);
+
 static E_Config_DD *conf_edd = NULL;
 
 Config *battery_config = NULL;
@@ -85,28 +60,32 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Object *o;
    E_Gadcon_Client *gcc;
    Instance *inst;
-   
+
+   battery_config->full = -2;
+   battery_config->time_left = -2;
+   battery_config->have_battery = -2;
+   battery_config->have_power = -2;
+
    inst = E_NEW(Instance, 1);
-   
+
    o = edje_object_add(gc->evas);
    e_theme_edje_object_set(o, "base/theme/modules/battery",
 			   "e/modules/battery/main");
-   
+
    gcc = e_gadcon_client_new(gc, name, id, style, o);
    gcc->data = inst;
-   
+
    inst->gcc = gcc;
    inst->o_battery = o;   
-   
+   inst->warning = NULL;
+   inst->popup_battery = NULL;
+
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
 				  _button_cb_mouse_down, inst);
-   battery_config->instances = evas_list_append(battery_config->instances, inst);
-   battery_config->battery_check_mode = CHECK_NONE;
-   battery_config->battery_prev_level = -1;
-   battery_config->battery_prev_drain = 1;
-   battery_config->battery_prev_ac = -1;
-   battery_config->battery_prev_battery = -1;
-   _battery_cb_check(NULL);
+   battery_config->instances = 
+     evas_list_append(battery_config->instances, inst);
+   _battery_config_updated();
+
    return gcc;
 }
 
@@ -114,21 +93,34 @@ static void
 _gc_shutdown(E_Gadcon_Client *gcc)
 {
    Instance *inst;
-   
+
    inst = gcc->data;
-   battery_config->instances = evas_list_remove(battery_config->instances, inst);
+   battery_config->instances = 
+     evas_list_remove(battery_config->instances, inst);
    evas_object_del(inst->o_battery);
-   free(inst);
+   if (inst->warning)
+     {
+        e_object_del(E_OBJECT(inst->warning));
+        inst->popup_battery = NULL;
+     }
+   E_FREE(inst);
 }
 
 static void
 _gc_orient(E_Gadcon_Client *gcc)
 {
    Instance *inst;
-   
+   Evas_Coord mw, mh;
+
    inst = gcc->data;
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_battery, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_battery, &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 char *
@@ -142,7 +134,7 @@ _gc_icon(Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
-   
+
    o = edje_object_add(evas);
    snprintf(buf, sizeof(buf), "%s/e-module-battery.edj",
 	    e_module_dir_get(battery_config->module));
@@ -156,17 +148,12 @@ _gc_id_new(void)
    return _gadcon_class.name;
 }
 
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
 static void
 _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Instance *inst;
    Evas_Event_Mouse_Down *ev;
-   
+
    inst = data;
    ev = event_info;
    if ((ev->button == 3) && (!battery_config->menu))
@@ -174,18 +161,18 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	E_Menu *mn;
 	E_Menu_Item *mi;
 	int cx, cy, cw, ch;
-	
+
 	mn = e_menu_new();
 	e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
 	battery_config->menu = mn;
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");   
+	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
 	e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL);
-	
+
 	e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
-	
+
 	e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon,
 					  &cx, &cy, &cw, &ch);
 	e_menu_activate_mouse(mn,
@@ -195,6 +182,8 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
 					ev->button);
      }
+   if (ev->button == 1)
+     _battery_cb_warning_popup_hide(data, e, obj, event_info);
 }
 
 static void
@@ -205,1213 +194,177 @@ _menu_cb_post(void *data, E_Menu *m)
    battery_config->menu = NULL;
 }
 
-static int
-_battery_cb_check(void *data)
-{
-   Status *ret = NULL;
-   Evas_List *l;
-#ifdef __FreeBSD__
-   int acline;
-   size_t len;
-   int apm_fd = -1;
-   int acline_mib[3] = {-1};
-#endif
-
-#ifdef __FreeBSD__
-   if (battery_config->battery_check_mode == 0)
-     {
-      	len = sizeof(acline);
-      	if (sysctlbyname("hw.acpi.acline", &acline, &len, NULL, 0) == 0) 
-      	  {
-	     len = 3;
-	     if (sysctlnametomib("hw.acpi.acline", acline_mib, &len) == 0)
-      	        battery_config->battery_check_mode = CHECK_ACPI; 
-	  }
-	else
-	  {
-	     apm_fd = open("/dev/apm", O_RDONLY); 
-	     if (apm_fd != -1)
-	       battery_config->battery_check_mode = CHECK_APM;
-	  }
-     }
-   switch (battery_config->battery_check_mode)
-     {
-      case CHECK_ACPI:
-	ret = _battery_bsd_acpi_check();
-	break;
-      case CHECK_APM:
-	ret = _battery_bsd_apm_check();
-	break;
-      default:
-	break;
-     }
-#elif defined(HAVE_CFBASE_H) /* OS X */
-   ret = _battery_darwin_check();
-#else
-   if (battery_config->battery_check_mode == 0)
-     {
-	if (ecore_file_is_dir("/proc/acpi"))
-	  battery_config->battery_check_mode = CHECK_ACPI;
-	else if (ecore_file_exists("/proc/apm"))
-	  battery_config->battery_check_mode = CHECK_APM;
-	else if (ecore_file_is_dir("/proc/pmu"))
-	  battery_config->battery_check_mode = CHECK_PMU;
-     }
-   switch (battery_config->battery_check_mode)
-     {
-      case CHECK_ACPI:
-	ret = _battery_linux_acpi_check();
-	break;
-      case CHECK_APM:
-	ret = _battery_linux_apm_check();
-	break;
-      case CHECK_PMU:
-	ret = _battery_linux_powerbook_check();
-	break;
-      default:
-	break;
-     }
-#endif
-   for (l = battery_config->instances; l; l = l->next)
-     {
-	Instance *inst;
-	
-	inst = l->data;
-	if (ret)
-	  {
-	     if (ret->has_battery)
-	       {
-		  if (ret->state == BATTERY_STATE_CHARGING)
-		    {
-		       if (battery_config->battery_prev_ac != 1)
-			 edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
-		       edje_object_signal_emit(inst->o_battery, "e,action,pulse,stop", "e");
-		       edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
-		       edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
-		       _battery_face_level_set(inst, ret->level);
-		       battery_config->battery_prev_ac = 1;
-		    }
-		  else if (ret->state == BATTERY_STATE_DISCHARGING)
-		    {
-		       if (battery_config->battery_prev_ac != 0)
-			 edje_object_signal_emit(inst->o_battery, "e,state,discharging", "e");
-		       if (ret->alarm)
-			 {
-			    if (!battery_config->alarm_triggered)
-			      {
-				 E_Dialog *dia;
-				 
-				 dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_battery_low_dialog");
-				 if (!dia) return 0;
-				 e_dialog_title_set(dia, "Enlightenment Battery Module");
-				 e_dialog_icon_set(dia, "enlightenment/e", 64);
-				 e_dialog_text_set(dia,
-						   _("Battery Running Low<br>"
-						     "Your battery is running low.<br>"
-						     "You may wish to switch to an AC source."));
-				 e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
-				 e_win_centered_set(dia->win, 1);
-				 e_dialog_show(dia);
-				 edje_object_signal_emit(inst->o_battery, "e,action,pulse,start", "e");
-			      }
-			 }
-		       edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
-		       edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
-		       _battery_face_level_set(inst, ret->level);
-		       battery_config->battery_prev_ac = 0;
-		       if (ret->alarm)
-			 battery_config->alarm_triggered = 1;
-		    }
-		  else
-		    {
-		       /* ret->state == BATTERY_STATE_NONE */
-		       if (battery_config->battery_prev_ac != 1)
-			 edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
-		       if (battery_config->battery_prev_battery == 0)
-			 edje_object_signal_emit(inst->o_battery, "e,state,charging", "e");
-		       edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
-		       edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
-		       _battery_face_level_set(inst, ret->level);
-		       battery_config->battery_prev_ac = 1;
-		       battery_config->battery_prev_battery = 1;
-		    }
-	       }
-	     else
-	       {
-		  /* Hasn't battery */
-		  if (battery_config->battery_prev_battery != 0)
-		    edje_object_signal_emit(inst->o_battery, "e,state,unknown", "e");
-		  edje_object_part_text_set(inst->o_battery, "e.text.reading", ret->reading);
-		  edje_object_part_text_set(inst->o_battery, "e.text.time", ret->time);
-		  _battery_face_level_set(inst, ret->level);
-		  battery_config->battery_prev_battery = 0;
-	       }
-	  }
-	else
-	  {
-	     /* Error reading status */
-	     if (battery_config->battery_prev_battery != -2)
-	       edje_object_signal_emit(inst->o_battery, "e,state,unknown", "e");
-	     edje_object_part_text_set(inst->o_battery, "e.text.reading", _("ERROR"));
-	     edje_object_part_text_set(inst->o_battery, "e.text.time", "--:--");
-	     _battery_face_level_set(inst, (double)(rand() & 0xff) / 255.0);
-	     battery_config->battery_prev_battery = -2;
-	     battery_config->battery_check_mode = CHECK_NONE;
-	  }
-     }
-   if (ret)
-     {
-	free(ret->reading);
-	free(ret->time);
-	free(ret);
-     }
-   return 1;
-}
-
-static Status *
-_battery_linux_acpi_check(void)
+static void
+_battery_face_level_set(Evas_Object *battery, double level)
 {
-   Ecore_List *bats;
-   char buf[4096], buf2[4096];
-   char *name;
-   int bat_max = 0;
-   int bat_filled = 0;
-   int bat_level = 0;
-   int bat_drain = 1;
-   int bat_val = 0;
-   int discharging = 0;
-   int charging = 0;
-   int battery = 0;
-   int design_cap_unknown = 0;
-   int last_full_unknown = 0;
-   int rate_unknown = 0;
-   int level_unknown = 0;
-   int hours, minutes;
-   Status *stat;
-   static double last_poll_time = 0.0;
-   double poll_time, t;
-
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
-
-   t = ecore_time_get();
-   poll_time = t - last_poll_time;
-   last_poll_time = t;
-   
-   /* Read some information on first run. */
-   bats = ecore_file_ls("/proc/acpi/battery");
-   if (bats)
-     {
-	while ((name = ecore_list_next(bats)))
-	  {
-	     FILE *f;
-	     char *tmp;
-	     int design_cap;
-	     int last_full;
-
-	     snprintf(buf, sizeof(buf), "/proc/acpi/battery/%s/info", name);
-	     f = fopen(buf, "r");
-	     if (f)
-	       {
-		  design_cap = 0;
-		  last_full = 0;
-		  /* present */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  /* design capacity */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_string_get(buf2);
-		  if (tmp)
-		    {
-		       if (!strcmp(tmp, "unknown")) design_cap_unknown = 1;
-		       else design_cap = atoi(tmp);
-		       free(tmp);
-		    }
-		  /* last full capacity */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_string_get(buf2);
-		  if (tmp)
-		    {
-		       if (!strcmp(tmp, "unknown")) last_full_unknown = 1;
-		       else last_full = atoi(tmp);
-		       free(tmp);
-		    }
-		  fclose(f);
-	       }
-	     snprintf(buf, sizeof(buf), "/proc/acpi/battery/%s/state", name);
-	     f = fopen(buf, "r");
-	     if (f)
-	       {
-		  char *present;
-		  char *capacity_state;
-		  char *charging_state;
-		  char *tmp;
-		  int rate = 1;
-		  int level = 0;
-
-		  /* present */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  present = _battery_string_get(buf2);
-		  /* capacity state */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  capacity_state = _battery_string_get(buf2);
-		  /* charging state */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  charging_state = _battery_string_get(buf2);
-		  /* present rate */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_string_get(buf2);
-		  if (tmp)
-		    {
-		       if (!strcmp(tmp, "unknown")) rate_unknown++;
-		       else rate = atoi(tmp);
-		       free(tmp);
-		    }
-		  /* remaining capacity */
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_string_get(buf2);
-		  if (tmp)
-		    {
-		       if (!strcmp(tmp, "unknown")) level_unknown++;
-		       else level = atoi(tmp);
-		       free(tmp);
-		    }
-		  fclose(f);
-		  if (present)
-		    {
-		       if (!strcmp(present, "yes")) battery++;
-		       free(present);
-		    }
-		  if (charging_state)
-		    {
-		       if (!strcmp(charging_state, "discharging"))
-			 {
-			    discharging++;
-                            if ((rate == 0) && (rate_unknown == 0)) rate_unknown++;
-			 }
-		       else if (!strcmp(charging_state, "charging"))
-			 {
-			    charging++;
-                            if ((rate == 0) && (rate_unknown == 0)) rate_unknown++;
-			 }
-		       else if (!strcmp(charging_state, "charged"))
-			 {
-			    rate_unknown--;
-			 }
-		       free(charging_state);
-		    }
-		  E_FREE(capacity_state);
-
-		  bat_drain += rate;
-		  bat_level += level;
-	       }
-	     bat_max += design_cap;
-	     bat_filled += last_full;
-	  }
-	ecore_list_destroy(bats);
-     }
-   
-   if ((rate_unknown) && (bat_level != battery_config->battery_prev_level) &&
-       (battery_config->battery_prev_level >= 0) && (poll_time > 0.0))
-     {
-	bat_drain = 
-	  ((bat_level - battery_config->battery_prev_level) * 60 * 60) /
-	  poll_time;
-	if (bat_drain < 0) bat_drain = -bat_drain;
-	if (bat_drain == 0) bat_drain = 1;
-	rate_unknown = 0;
-     }
-   else
-     {
-	if (battery_config->battery_prev_drain < 1)
-	  battery_config->battery_prev_drain = 1;
-	if (bat_drain < 1)
-	  bat_drain = battery_config->battery_prev_drain;
-	battery_config->battery_prev_drain = bat_drain;
-     }
-   
-   if (bat_filled > 0) bat_val = (100 * bat_level) / bat_filled;
-   else bat_val = 100;
-   
-   battery_config->battery_prev_level = bat_level;
-   
-   if (discharging) minutes = (60 * bat_level) / bat_drain;
-   else
-     {
-	/* FIXME: Batteries charge in paralell! */
-	if (bat_filled > 0)
-	  minutes = (60 * (bat_filled - bat_level)) / bat_drain;
-	else
-	  minutes = 0;
-     }
-   hours = minutes / 60;
-   minutes -= (hours * 60);
+   Edje_Message_Float msg;
+   char buf[256];
 
-   if (hours < 0) hours = 0;
-   if (minutes < 0) minutes = 0;
+   snprintf(buf, sizeof(buf), "%i%%", (int)(level*100.0));
+   edje_object_part_text_set(battery, "e.text.reading", buf);
 
-   if (!battery)
-     {
-	stat->has_battery = 0;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("N/A"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   else if ((charging) || (discharging))
-     {
-	battery_config->battery_prev_battery = 1;
-	stat->has_battery = 1;
-        if (charging)
-          {
-	     stat->state = BATTERY_STATE_CHARGING;
-	     battery_config->alarm_triggered = 0;
-          }
-	else if (discharging)
-	  {
-	     stat->state = BATTERY_STATE_DISCHARGING;
-	     if (stat->level < 0.1)
-	       {
-		  if (((hours * 60) + minutes) <= battery_config->alarm)
-		    stat->alarm = 1;
-		  if (bat_val <= battery_config->alarm_p)
-		    stat->alarm = 1;
-	       }
-	  }
-	if (level_unknown)
-          {
-	     stat->reading = strdup(_("BAD DRIVER"));
-	     stat->time = strdup("--:--");
-	     stat->level = 0.0;
-          }
-	else if (rate_unknown)
-          {
-             snprintf(buf, sizeof(buf), "%i%%", bat_val);
-	     stat->reading = strdup(buf);
-	     stat->time = strdup("--:--");
-	     stat->level = (double)bat_val / 100.0;
-          }
-	else
-          {
-             snprintf(buf, sizeof(buf), "%i%%", bat_val);
-	     stat->reading = strdup(buf);
-             snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	     stat->time = strdup(buf);
-	     stat->level = (double)bat_val / 100.0;
-          }
-     }
-   else
-     {
-	stat->has_battery = 1;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("FULL"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   return stat;
+   if (level < 0.0) level = 0.0;
+   else if (level > 1.0) level = 1.0;
+   msg.val = level;
+   edje_object_message_send(battery, EDJE_MESSAGE_FLOAT, 1, &msg);
 }
 
-static Status *
-_battery_linux_apm_check(void)
+static void _battery_face_time_set(Evas_Object *battery, int time_left)
 {
-   FILE *f;
-   char s[256], s1[32], s2[32], s3[32], buf[4096];
-   int  apm_flags, ac_stat, bat_stat, bat_flags, bat_val, time_val;
-   int  hours, minutes;
-
-   Status *stat;
+   char buf[256];
+   int hrs, mins;
+
+   hrs = (time_left / 3600);
+   mins = ((time_left) / 60 - (hrs * 60));
+   snprintf(buf, sizeof(buf), "%i:%02i", hrs, mins);
+   if (hrs < 0) hrs = 0;
+   if (mins < 0) mins = 0;
+   edje_object_part_text_set(battery, "e.text.time", buf);
+}
 
-   f = fopen("/proc/apm", "r");
-   if (!f) return NULL;
+static void 
+_battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi) 
+{
+   if (!battery_config) return;
+   if (battery_config->config_dialog) return;
+   e_int_config_battery_module(m->zone->container, NULL);
+}
 
-   fgets(s, sizeof(s), f); s[sizeof(s) - 1] = 0;
-   if (sscanf(s, "%*s %*s %x %x %x %x %s %s %s",
-	      &apm_flags, &ac_stat, &bat_stat, &bat_flags, s1, s2, s3) != 7)
-     {
-	fclose(f);
-	return NULL;
-     }
-   s1[strlen(s1) - 1] = 0;
-   bat_val = atoi(s1);
-   if (!strcmp(s3, "sec")) time_val = atoi(s2);
-   else if (!strcmp(s3, "min")) time_val = atoi(s2) * 60;
-   fclose(f);
+void
+_battery_config_updated(void)
+{
+   Evas_List *l = NULL;
+   char buf[4096];
 
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
+   if (!battery_config) return;
 
-   if ((bat_flags != 0xff) && (bat_flags & 0x80))
+   if (battery_config->instances)
      {
-	stat->has_battery = 0;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup("N/A");
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-	return stat;
-     }
-   
-   
-   battery_config->battery_prev_battery = 1;
-   stat->has_battery = 1;
-   if (bat_val >= 0)
-     {
-	if (bat_val > 100) bat_val = 100;
-	snprintf(buf, sizeof(buf), "%i%%", bat_val);
-	stat->reading = strdup(buf);
-	stat->level = (double)bat_val / 100.0;
-     }
-   else
-     {
-	switch (bat_stat)
-	  {
-	   case 0:
-	      stat->reading = strdup(_("High"));
-	      stat->level = 1.0;
-	      break;
-	   case 1:
-	      stat->reading = strdup(_("Low"));
-	      stat->level = 0.5;
-	      break;
-	   case 2:
-	      stat->reading = strdup(_("Danger"));
-	      stat->level = 0.25;
-	      break;
-	   case 3:
-	      stat->reading = strdup(_("Charging"));
-	      stat->level = 1.0;
-	      break;
-	  }
+        for (l = battery_config->instances; l; l = l->next)
+          _battery_warning_popup_destroy(l->data);
      }
 
-   if (ac_stat == 1)
-     {
-	stat->state = BATTERY_STATE_CHARGING;
-	stat->time = strdup("--:--");
-     }
-   else
+   if (battery_config->batget_exe)
      {
-	/* ac_stat == 0 */
-	stat->state = BATTERY_STATE_DISCHARGING;
-
-	hours = time_val / 3600;
-	minutes = (time_val / 60) % 60;
-	snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	stat->time = strdup(buf);
-	if (stat->level < 0.1)
-	  {
-	     if (((hours * 60) + minutes) <= battery_config->alarm)
-	       stat->alarm = 1;
-	     if (bat_val <= battery_config->alarm_p)
-	       stat->alarm = 1;
-	  }
+	ecore_exe_terminate(battery_config->batget_exe);
+	ecore_exe_free(battery_config->batget_exe);
      }
+   snprintf(buf, sizeof(buf),
+	    "%s/%s/batget %i",
+	    e_module_dir_get(battery_config->module), MODULE_ARCH,
+	    battery_config->poll_interval);
 
-   return stat;
+   battery_config->batget_exe = 
+     ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_READ |
+                        ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+                        ECORE_EXE_NOT_LEADER, NULL);
 }
 
-
-/* hack for pmu */
-
-/* This function converts a string to an integer. Additionally to
- * atoi() it converts also hexadecimal values
- */
 static int
-axtoi(char *arg)
+_battery_cb_warning_popup_timeout(void *data)
 {
-   int n, val, pwr=1, m, rc = 0;
-   char hex[9], c;
-   
-   for (n = 0, m = 0; n < strlen(arg); n++)
-     {
-	if (arg[n] != ' ')
-	  {
-	     hex[m++] = c = toupper(arg[n]);
-	     if ((m == sizeof(hex)) || (c < '0') || (c > 'F'))
-	       return 0;   /* overflow or invalid */
-	  }
-     }
-   hex[m] = '\0';  /* terminate string */
-   
-   for (n = 0; n < m; n++)
-     {
-	c = hex[m-n-1];
-	if ((c >= 'A') && (c <= 'F'))
-	  val = c -'A' + 10;
-	else
-	  val = c - '0';
-	rc = rc + val * pwr;
-	pwr *= 16;
-     }
-   return rc;
-}
-
-static Status *
-_battery_linux_powerbook_check(void)
-{
-   Ecore_List *bats;
-   char buf[4096], buf2[4096];
-   char *name;
-   char *token;
-   FILE *f;
-   int discharging = 0;
-   int charging = 0;
-   int battery = 0;
-   int ac = 0;
-   int seconds = 0;
-   int hours, minutes;
-   int flags;
-   int voltage;
-   int charge;
-   int max_charge;
-   double tmp;
-   Status *stat;
-
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
-
-   /* Read some information. */
-   f = fopen("/proc/pmu/info", "r");
-   if (f)
-     {
-	/* Skip driver */
-	fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-	/* Skip firmware */
-	fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-	/* Read ac */
-	fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-	ac = _battery_int_get(buf2);
-	fclose(f);
-     }
+   Instance *inst;
 
-   bats = ecore_file_ls("/proc/pmu");
-   if (bats)
-     {
-	while ((name = ecore_list_next(bats)))
-	  {
-	     if (strncmp(name, "battery", 7))
-	       continue;
+   inst = data;
 
-	     snprintf(buf, sizeof(buf), "/proc/pmu/%s", name);
-	     f = fopen(buf, "r");
-	     if (f)
-	       {
-		  int time = 0;
-		  int current = 0;
+   e_gadcon_popup_hide(inst->warning);
 
-		  while (fgets (buf,sizeof (buf), f))
-		    {
-		       if ((token = strtok (buf, ":")))
-			 {
-			    if (!strncmp ("flags", token, 5))
-			      flags = axtoi (strtok (0, ": "));
-			    else if (!strncmp ("charge", token, 6)) 
-			      charge = atoi(strtok(0, ": "));
-			    else if (!strncmp ("max_charge", token, 9))
-			      max_charge = atoi (strtok(0,": "));
-			    else if (!strncmp ("current", token, 7))
-			      current = atoi (strtok(0, ": "));
-			    else if (!strncmp ("time rem", token, 8))
-			      time = atoi (strtok(0, ": "));
-			    else if (!strncmp ("voltage", token, 7))
-			      voltage = atoi (strtok(0,": "));
-			    else
-			      strtok (0,": ");
-			 }
-		    }
-		  /* Skip flag;
-		  int tmp = 0;		  
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_int_get(buf2);
-		  charge += tmp;
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  tmp = _battery_int_get(buf2);
-		  max_charge += tmp;
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  current = _battery_int_get(buf2);
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  fgets(buf2, sizeof(buf2), f); buf2[sizeof(buf2) - 1] = 0;
-		  time = _battery_int_get(buf2);
-		   */
-		  fclose(f);
-
-		  battery = 1;
-		  if (!current)
-		    {
-		       /* Neither charging nor discharging */
-		    }
-		  else if (!ac)
-		    {
-		       /* When on dc, we are discharging */
-		       discharging = 1;
-		       seconds += time;
-		    }
-		  else
-		    {
-		       /* Charging */
-		       charging = 1;
-		       /* Charging works in paralell */
-		       seconds = MAX(time, seconds);
-		    }
+   return 0;
+}
 
-	       }
-	  }
-	ecore_list_destroy(bats);
-     }
-   hours = seconds / (60 * 60);
-   seconds -= hours * (60 * 60);
-   minutes = seconds / 60;
-   seconds -= minutes * 60;
+static void
+_battery_cb_warning_popup_hide(void *data, Evas *e, Evas_Object *obj, void *event)
+{
+   Instance *inst = NULL;
 
-   if (hours < 0) hours = 0;
-   if (minutes < 0) minutes = 0;
+   inst = (Instance *)data;
+   if ((!inst) || (!inst->warning)) return;
 
-   
-   if (!battery)
-     {
-	stat->has_battery = 0;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("N/A"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   else if ((charging) || (discharging))
-     {
-	stat->has_battery = 1;
-	stat->level = (double)charge / (double)max_charge;
-	if (stat->level > 1.0) stat->level = 1.0;
-	tmp = (double)max_charge / 100;
-	tmp = (double)charge / tmp;
-	stat->level = (double)tmp / 100;
-
-	snprintf(buf, sizeof(buf), "%.0f%%", tmp);
-	stat->reading = strdup(buf);
-	snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	stat->time = strdup(buf);
-	if (charging)
-	  {
-	     stat->state = BATTERY_STATE_CHARGING;
-	     battery_config->alarm_triggered = 0;
-	  }
-	else if (discharging)
-	  {
-	     stat->state = BATTERY_STATE_DISCHARGING;
-	     if (stat->level < 0.1)
-	       {
-		  if (((hours * 60) + minutes) <= battery_config->alarm)
-		    stat->alarm = 1;
-		  if (stat->level <= battery_config->alarm_p)
-		    stat->alarm = 1;
-	       }
-	  }
-     }
-   else
-     {
-	stat->has_battery = 1;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("FULL"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   return stat;
+   e_gadcon_popup_hide(inst->warning);
 }
 
-#ifdef __FreeBSD__
-static Status *
-_battery_bsd_acpi_check(void)
+static void
+_battery_warning_popup_destroy(Instance *inst)
 {
-   /* Assumes only a single battery - I don't know how multiple batts 
-    * are represented in sysctl */
-
-   Ecore_List *bats;
-   char buf[4096], buf2[4096];
-   char *name;
-
-   int bat_max = 0;
-   int bat_filled = 0;
-   int bat_level = 0;
-   int bat_drain = 1;
-
-   int bat_val = 0;
-
-   int discharging = 0;
-   int charging = 0;
-   int battery = 0;
-
-   int design_cap_unknown = 0;
-   int last_full_unknown = 0;
-   int rate_unknown = 0;
-   int level_unknown = 0;
-
-   int hours, minutes;
-   
-   int mib_state[4];
-   int mib_life[4];
-   int mib_time[4];
-   int mib_units[4];
-   size_t len;
-   int state;
-   int level;
-   int time;
-   int life;
-   int batteries;
-
-   Status *stat;
-
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
-
-   /* 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)
-      /* ERROR */
-      state = -1;     
-
-   len = 4;
-   sysctlnametomib("hw.acpi.battery.life", mib_life, &len);
-   len = sizeof(life);
-   if (sysctl(mib_life, 4, &life, &len, NULL, 0) == -1)
-      /* ERROR */
-      level = -1;
-
-   bat_val = life;
-      
-   len = 4;
-   sysctlnametomib("hw.acpi.battery.time", mib_time, &len);
-   len = sizeof(time);
-   if (sysctl(mib_time, 4, &time, &len, NULL, 0) == -1)
-      /* ERROR */
-      time = -2;     
-
-   len = 4;
-   sysctlnametomib("hw.acpi.battery.units", mib_units, &len);
-   len = sizeof(batteries);
-   if (sysctl(mib_time, 4, &batteries, &len, NULL, 0) == -1)
-      /* ERROR */
-      batteries = 1;     
-   
-   if (battery_config->battery_prev_drain < 1)  
-     battery_config->battery_prev_drain = 1;
-   
-   if (bat_drain < 1) 
-     bat_drain = battery_config->battery_prev_drain;
-   
-   battery_config->battery_prev_drain = bat_drain;
-
-   /*if (bat_filled > 0) 
-     bat_val = (100 * bat_level) / bat_filled;
-   else 
-     bat_val = 100;
-
-   if (state == BATTERY_STATE_DISCHARGING) 
-     minutes = (60 * bat_level) / bat_drain;
-   else
-     {
-	if (bat_filled > 0)
-	  minutes = (60 * (bat_filled - bat_level)) / bat_drain;
-	else
-	  minutes = 0;
-     }*/
-   minutes = time;
-   hours = minutes / 60;
-   minutes -= (hours * 60);
-
-   if (hours < 0) 
-     hours = 0;
-   if (minutes < 0) 
-     minutes = 0;
-
-   if (batteries == 1) /* hw.acpi.battery.units = 1 means NO BATTS */
-     {
-	stat->has_battery = 0;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("N/A"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   else if ((state == BATTERY_STATE_CHARGING) || 
-	    (state == BATTERY_STATE_DISCHARGING)) 
-     {
-	battery_config->battery_prev_battery = 1;
-	stat->has_battery = 1;
-        if (state == BATTERY_STATE_CHARGING)
-          {
-	     stat->state = BATTERY_STATE_CHARGING;
-	     battery_config->alarm_triggered = 0;
-          }
-	else if (state == BATTERY_STATE_DISCHARGING)
-	  {
-	     stat->state = BATTERY_STATE_DISCHARGING;
-	     if (stat->level < 0.1) /* Why this if condition */
-	       {
-		  if (((hours * 60) + minutes) <= battery_config->alarm)
-		    stat->alarm = 1;
-		  if (bat_val <= battery_config->alarm_p)
-		    stat->alarm = 1;
-	       }
-	  }
-	if (level == -1)
-          {
-	     stat->reading = strdup(_("BAD DRIVER"));
-	     stat->time = strdup("--:--");
-	     stat->level = 0.0;
-          }
-	else if (time == -1)
-          {
-             snprintf(buf, sizeof(buf), "%i%%", bat_val);
-	     stat->reading = strdup(buf);
-	     stat->time = strdup("--:--");
-	     stat->level = (double)bat_val / 100.0;
-          }
-	else
-          {
-             snprintf(buf, sizeof(buf), "%i%%", bat_val);
-	     stat->reading = strdup(buf);
-             snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	     stat->time = strdup(buf);
-	     stat->level = (double)bat_val / 100.0;
-          }
-     }
-   else
-     {
-	stat->has_battery = 1;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup(_("FULL"));
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-     }
-   return stat;
+   if (!inst || !inst->warning) return;
+
+   e_object_del(E_OBJECT(inst->warning));
+   inst->warning = NULL;
+   inst->popup_battery = NULL;
 }
 
-static Status *
-_battery_bsd_apm_check(void)
+static void
+_battery_warning_popup_resize(Evas_Object *obj, int *w, int *h)
 {
-#ifdef __i386__
-   int  ac_stat, bat_stat, bat_val, time_val;
-   char buf[4096];
-   int  hours, minutes;
-   int apm_fd = -1;
-   struct apm_info info;
-   
-   Status *stat;
-
-   apm_fd = open("/dev/apm", O_RDONLY);
-   
-   if (apm_fd != -1 && ioctl(apm_fd, APMIO_GETINFO, &info) != -1)
-     {
-	/* set values */
-	ac_stat = info.ai_acline;
-	bat_stat = info.ai_batt_stat;
-	bat_val = info.ai_batt_life;
-	time_val = info.ai_batt_time;
-     }
-   else
-     {
-        return NULL;
-     }
-
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
+   int mw, mh;
 
-   if (info.ai_batteries == 1) /* ai_batteries == 1 means NO battery,
-				  ai_batteries == 2 means 1 battery */
-     {
-	stat->has_battery = 0;
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup("N/A");
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-	return stat;
-     }
-   
-   
-   battery_config->battery_prev_battery = 1;
-   stat->has_battery = 1;
-
-   if (ac_stat) /* Wallpowered */
-     {
-	stat->state = BATTERY_STATE_CHARGING;
-	stat->time = strdup("--:--");
-	switch (bat_stat) /* On FreeBSD the time_val is -1 when AC ist plugged
-			     in. This means we don't know how long the battery
-			     will recharge */ 
-	  {
-	   case 0:
-	      stat->reading = strdup(_("High"));
-	      stat->level = 1.0; 
-	      break;
-	   case 1:
-	      stat->reading = strdup(_("Low"));
-	      stat->level = 0.5;
-	      break;
-	   case 2:
-	      stat->reading = strdup(_("Danger"));
-	      stat->level = 0.25;
-	      break;
-	   case 3:
-	      stat->reading = strdup(_("Charging"));
-	      stat->level = 1.0;
-	      break;
-	  }
-     }
-   else /* Running on battery */
-     {
-	stat->state = BATTERY_STATE_DISCHARGING;
-	
-        snprintf(buf, sizeof(buf), "%i%%", bat_val);
-        stat->reading = strdup(buf);
-        stat->level = (double)bat_val / 100.0;
-	
-	hours = time_val / 3600;
-	minutes = (time_val / 60) % 60;
-	snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	stat->time = strdup(buf);
-
-	if (stat->level < 0.1) /* Why this if condition? */
-	  {
-	     if (((hours * 60) + minutes) <= battery_config->alarm)
-	       stat->alarm = 1;
-	     if (bat_val <= battery_config->alarm_p)
-	       stat->alarm = 1;
-	  }
-     }
-   
-   return stat;
-#else
-   return NULL;
-#endif
+   edje_object_size_min_get(obj,&mw,&mh);
+   if (w) *w = mw;
+   if (h) *h = mh;
 }
-#endif
 
-#ifdef HAVE_CFBASE_H
-/*
- * There is a good chance this will work with a UPS as well as a battery.
- */
-static Status *
-_battery_darwin_check(void)
+static void
+_battery_warning_popup(Instance *inst, int time, double percent)
 {
-   const void *values;
-   int device_num;
-   int device_count;
-   int  hours, minutes;
-   int currentval = 0;
-   int maxval = 0;
-   char buf[4096];
-   CFTypeRef blob;
-   CFArrayRef sources;
-   CFDictionaryRef device_dict;
-   
-   Status *stat;
-
-   stat = E_NEW(Status, 1);
-   if (!stat) return NULL;
-
-   /*
-    * Retrieve the power source data and the array of sources.
-    */
-   blob = IOPSCopyPowerSourcesInfo();
-   sources = IOPSCopyPowerSourcesList(blob);
-   device_count = CFArrayGetCount(sources); 
-
-   for (device_num = 0; device_num < device_count; device_num++)
-     {
-	CFTypeRef ps;
-
-	printf("device %d of %d\n", device_num, device_count);
-
-	/*
-	 * Retrieve a dictionary of values for this device and the
-	 * count of keys in the dictionary.
-	 */
-	ps = CFArrayGetValueAtIndex(sources, device_num);
-	device_dict = IOPSGetPowerSourceDescription(blob, ps);
-
-	/*
-	 * Retrieve the charging key and save the present charging value if
-	 * one exists.
-	 */
-	if (CFDictionaryGetValueIfPresent(device_dict, CFSTR(kIOPSIsChargingKey), &values))
-	  {
-	     stat->has_battery = 1;
-	     printf("%s: %d\n", kIOPSIsChargingKey, CFBooleanGetValue(values));
-	     if (CFBooleanGetValue(values) > 0)
-	       {
-		  stat->state = BATTERY_STATE_CHARGING;
-	       }
-	     else
-	       {
-		  stat->state = BATTERY_STATE_DISCHARGING;
-	       }
-	     /* CFRelease(values); */
-	     break;
-	  }
+   Evas *e = NULL;
+   Evas_Object *rect = NULL, *popup_bg = NULL;
+   int x,y,w,h;
 
-     }
+   if ((!inst) || (inst->warning)) return;
 
-   /*
-    * Check for battery.
-    */
-   if (!stat->has_battery)
-     {
-	CFRelease(sources);
-	CFRelease(blob);
-	stat->state = BATTERY_STATE_NONE;
-	stat->reading = strdup("N/A");
-	stat->time = strdup("--:--");
-	stat->level = 1.0;
-	return stat;
-     }
-
-   /*
-    * A battery was found so move along based on that assumption.
-    */
-   battery_config->battery_prev_battery = 1;
-   stat->has_battery = 1;
-
-   /*
-    * Retrieve the current capacity key.
-    */
-   values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSCurrentCapacityKey));
-   CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
-   /* CFRelease(values); */
-
-   /*
-    * Retrieve the max capacity key.
-    */
-   values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSMaxCapacityKey));
-   CFNumberGetValue(values, kCFNumberSInt32Type, &maxval);
-   /* CFRelease(values); */
-
-   /*
-    * Calculate the percentage charged.
-    */
-   stat->level = (double)currentval / (double)maxval;
-   printf("Battery charge %g\n", stat->level);
-
-   /*
-    * Retrieve the remaining battery power or time until charged in minutes.
-    */
-   if (stat->state == BATTERY_STATE_DISCHARGING)
-     {
-	values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSTimeToEmptyKey));
-	CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
-	/* CFRelease(values); */
-
-	/*
-	 * Display remaining battery percentage.
-	 */
-	snprintf(buf, sizeof(buf), "%i%%", (int)(stat->level * 100));
-	stat->reading = strdup(buf);
-
-	hours = currentval / 60;
-	minutes = currentval % 60;
-
-	/*
-	 * Check if an alarm should be raised.
-	 */
-	if (currentval <= battery_config->alarm)
-	  stat->alarm = 1;
-	if (stat->level <= battery_config->alarm_p)
-	  stat->alarm = 1;
-     }
-   else
-     {
-	values = CFDictionaryGetValue(device_dict, CFSTR(kIOPSTimeToFullChargeKey));
-	CFNumberGetValue(values, kCFNumberSInt32Type, &currentval);
-	/* CFRelease(values); */
+   inst->warning = e_gadcon_popup_new(inst->gcc, _battery_warning_popup_resize);
+   if (!inst->warning) return;
 
-	stat->reading = strdup(_("Charging"));
+   e = inst->warning->win->evas;
 
-	hours = currentval / 60;
-	minutes = currentval % 60;
-     }
-
-   /*
-    * Store the time remaining.
-    */
-   if (minutes >= 0)
+   popup_bg = edje_object_add(e);
+   inst->popup_battery = edje_object_add(e);
+     
+   if ((!popup_bg) || (!inst->popup_battery))
      {
-	snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes);
-	stat->time = strdup(buf);
+        e_object_free(E_OBJECT(inst->warning));
+        inst->warning = NULL;
+        return;
      }
-   else
-     stat->time = strdup("--:--");
-
-   CFRelease(sources);
-   CFRelease(blob);
-
-   return stat;
-}
-#endif
 
-static void
-_battery_face_level_set(Instance *inst, double level)
-{
-   Edje_Message_Float msg;
+   e_theme_edje_object_set(popup_bg, "base/theme/modules/battery/popup",
+     "e/modules/battery/popup");
+   e_theme_edje_object_set(inst->popup_battery, "base/theme/modules/battery",
+     "e/modules/battery/main");
+   edje_object_part_swallow(popup_bg, "battery", inst->popup_battery);
 
-   if (level < 0.0) level = 0.0;
-   else if (level > 1.0) level = 1.0;
-   msg.val = level;
-   edje_object_message_send(inst->o_battery, EDJE_MESSAGE_FLOAT, 1, &msg);
-}
+   e_gadcon_popup_content_set(inst->warning, popup_bg);
+   e_gadcon_popup_show(inst->warning);
 
-static int
-_battery_int_get(char *buf)
-{
-   char *p, *q;
-
-   p = strchr(buf, ':');
-   if (!p) return 0;
-   p++;
-   while (*p == ' ') p++;
-   q = p;
-   while ((*q != ' ') && (*q != '\n')) q++;
-   if (q) *q = 0;
-   return atoi(p);
-}
+   evas_object_geometry_get(inst->warning->o_bg, &x, &y, &w, &h);
 
-static char *
-_battery_string_get(char *buf)
-{
-   char *p, *q;
-
-   p = strchr(buf, ':');
-   if (!p) return NULL;
-   p++;
-   while (*p == ' ') p++;
-   q = p;
-   while ((*q) && (*q != ' ') && (*q != '\n')) q++;
-   if (q) *q = 0;
-   return strdup(p);
-}
+   rect = evas_object_rectangle_add(e);
+   if (rect)
+     {
+        evas_object_move(rect, x, y);
+        evas_object_resize(rect, w, h);
+        evas_object_color_set(rect, 255, 255, 255, 0);
+        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN , 
+                                       _battery_cb_warning_popup_hide, inst);
+        evas_object_repeat_events_set(rect, 1);
+        evas_object_show(rect);
+     }
 
-static void 
-_battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi) 
-{
-   if (!battery_config) return;
-   if (battery_config->config_dialog) return;
-   e_int_config_battery_module(m->zone->container, NULL);
-}
+   _battery_face_time_set(inst->popup_battery, time);
+   _battery_face_level_set(inst->popup_battery, percent);
+   edje_object_signal_emit(inst->popup_battery, "e,state,discharging", "e");
 
-void
-_battery_config_updated(void)
-{
-   if (!battery_config) return;
-   ecore_poller_del(battery_config->battery_check_poller);
-   battery_config->battery_check_poller = 
-     ecore_poller_add(ECORE_POLLER_CORE, battery_config->poll_interval,
-		      _battery_cb_check, NULL);
-   _battery_cb_check(NULL);
+   if (battery_config->alert_timeout) 
+     {
+        ecore_timer_add(battery_config->alert_timeout, 
+                        _battery_cb_warning_popup_timeout, inst);
+     }
 }
 
-/***************************************************************************/
-/**/
 /* module setup */
 EAPI E_Module_Api e_modapi = 
 {
-   E_MODULE_API_VERSION,
-     "Battery"
+   E_MODULE_API_VERSION, "Battery"
 };
 
 EAPI void *
@@ -1425,36 +378,45 @@ e_modapi_init(E_Module *m)
 #define T Config
 #define D conf_edd
    E_CONFIG_VAL(D, T, poll_interval, INT);
-   E_CONFIG_VAL(D, T, alarm, INT);
-   E_CONFIG_VAL(D, T, alarm_p, INT);
+   E_CONFIG_VAL(D, T, alert, INT);
+   E_CONFIG_VAL(D, T, alert_p, INT);
+   E_CONFIG_VAL(D, T, alert_timeout, INT);
 
    battery_config = e_config_domain_load("module.battery", conf_edd);
    if (!battery_config)
      {
        battery_config = E_NEW(Config, 1);
-       battery_config->poll_interval = 256;
-       battery_config->alarm = 30;
-       battery_config->alarm_p = 10;
+       battery_config->poll_interval = 512;
+       battery_config->alert = 30;
+       battery_config->alert_p = 10;
+       battery_config->alert_timeout = 0;
      }
-   E_CONFIG_LIMIT(battery_config->poll_interval, 1, 1024);
-   E_CONFIG_LIMIT(battery_config->alarm, 0, 60);
-   E_CONFIG_LIMIT(battery_config->alarm_p, 0, 100);
-   
-   battery_config->battery_check_mode = CHECK_NONE;
-   battery_config->battery_prev_drain = 1;
-   battery_config->battery_prev_ac = -1;
-   battery_config->battery_prev_battery = -1;
-   battery_config->battery_check_poller = 
-     ecore_poller_add(ECORE_POLLER_CORE, battery_config->poll_interval,
-		      _battery_cb_check, NULL);
+   E_CONFIG_LIMIT(battery_config->poll_interval, 4, 4096);
+   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);
+
    battery_config->module = m;
-   
+   battery_config->full = -2;
+   battery_config->time_left = -2;
+   battery_config->have_battery = -2;
+   battery_config->have_power = -2;
+
+   battery_config->batget_data_handler =
+     ecore_event_handler_add(ECORE_EXE_EVENT_DATA,
+			     _battery_cb_exe_data, NULL);
+   battery_config->batget_del_handler =
+     ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
+			     _battery_cb_exe_del, NULL);
+
    e_gadcon_provider_register(&_gadcon_class);
-   
+
    snprintf(buf, sizeof(buf), "%s/e-module-battery.edj", e_module_dir_get(m));
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
-   e_configure_registry_item_add("advanced/battery", 100, _("Battery Meter"), NULL, buf, e_int_config_battery_module);
-   
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, 
+                                     "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/battery", 100, _("Battery Meter"), 
+                                 NULL, buf, e_int_config_battery_module);
+
    return m;
 }
 
@@ -1463,13 +425,28 @@ e_modapi_shutdown(E_Module *m)
 {
    e_configure_registry_item_del("advanced/battery");
    e_configure_registry_category_del("advanced");
-   
    e_gadcon_provider_unregister(&_gadcon_class);
-   
+
+   if (battery_config->batget_exe)
+     {
+	ecore_exe_terminate(battery_config->batget_exe);
+	ecore_exe_free(battery_config->batget_exe);
+	battery_config->batget_exe = NULL;
+     }
+
+   if (battery_config->batget_data_handler)
+     {
+	ecore_event_handler_del(battery_config->batget_data_handler);
+	battery_config->batget_data_handler = NULL;
+     }
+   if (battery_config->batget_del_handler)
+     {
+	ecore_event_handler_del(battery_config->batget_del_handler);
+	battery_config->batget_del_handler = NULL;
+     }
+
    if (battery_config->config_dialog)
      e_object_del(E_OBJECT(battery_config->config_dialog));
-   if (battery_config->battery_check_poller)
-     ecore_poller_del(battery_config->battery_check_poller);
    if (battery_config->menu)
      {
         e_menu_post_deactivate_callback_set(battery_config->menu, NULL, NULL);
@@ -1488,5 +465,154 @@ e_modapi_save(E_Module *m)
    e_config_domain_save("module.battery", conf_edd, battery_config);
    return 1;
 }
-/**/
-/***************************************************************************/
+
+static int
+_battery_cb_exe_data(void *data, int type, void *event)
+{
+   Ecore_Exe_Event_Data *ev;
+
+   ev = event;
+   if (ev->exe != battery_config->batget_exe) return 1;
+   if ((ev->lines) && (ev->lines[0].line))
+     {
+	int i;
+
+	for (i = 0; ev->lines[i].line; i++)
+	  {
+	     if (!strcmp(ev->lines[i].line, "ERROR"))
+	       {
+		  Evas_List *l;
+
+		  for (l = battery_config->instances; l; l = l->next)
+		    {
+		       Instance *inst;
+
+		       inst = l->data;
+		       edje_object_signal_emit(inst->o_battery, 
+                                               "e,state,unknown", "e");
+		       edje_object_part_text_set(inst->o_battery, 
+                                                 "e.text.reading", _("ERROR"));
+		       edje_object_part_text_set(inst->o_battery, 
+                                                 "e.text.time", _("ERROR"));
+
+                       if (inst->popup_battery)
+                         {
+                            edje_object_signal_emit(inst->popup_battery, 
+                                                    "e,state,unknown", "e");
+                            edje_object_part_text_set(inst->popup_battery, 
+                                                      "e.text.reading", _("ERROR"));
+                            edje_object_part_text_set(inst->popup_battery, 
+                                                      "e.text.time", _("ERROR"));
+                         }
+		    }
+	       }
+	     else
+	       {
+		  int full = 0;
+		  int time_left = 0;
+		  int have_battery = 0;
+		  int have_power = 0;
+		  Evas_List *l;
+                  int mins, hrs;
+                  static int debounce_popup = 0;
+
+                  if (debounce_popup > POPUP_DEBOUNCE_CYCLES)
+                    debounce_popup = 0;
+		  
+		  if (sscanf(ev->lines[i].line, "%i %i %i %i",
+			     &full, &time_left, &have_battery, &have_power)
+		      == 4)
+		    {
+		       for (l = battery_config->instances; l; l = l->next)
+			 {
+			    Instance *inst;
+
+			    inst = l->data;
+			    if (have_power != battery_config->have_power)
+			      {
+				 if (have_power)
+				   edje_object_signal_emit(inst->o_battery, 
+                                                           "e,state,charging", 
+                                                           "e");
+				 else
+                                   {
+                                      edje_object_signal_emit(inst->o_battery, 
+                                                              "e,state,discharging", 
+                                                              "e");
+                                      if (inst->popup_battery)
+                                        edje_object_signal_emit(inst->popup_battery, 
+                                                                "e,state,discharging", "e");
+                                   }
+			      }
+			    if (have_battery)
+			      {
+                                 if (battery_config->full != full)
+                                   {
+                                      _battery_face_level_set(inst->o_battery, 
+                                                              (double)full / 100.0);
+                                      if (inst->popup_battery)
+                                        _battery_face_level_set(inst->popup_battery, 
+                                                                (double)full / 100.0);
+                                   }
+			      }
+			    else
+                              {
+                                 _battery_face_level_set(inst->o_battery, 0.0);
+                                 edje_object_part_text_set(inst->o_battery, 
+                                                           "e.text.reading", 
+                                                           _("N/A"));
+                              }
+
+			    if (time_left != battery_config->time_left)
+                              {
+                                 _battery_face_time_set(inst->o_battery, time_left);
+                                 if (inst->popup_battery)
+                                   _battery_face_time_set(inst->popup_battery, 
+                                                          time_left);
+                              }
+
+                            if (have_battery && !have_power && (full != 100) &&
+                                ((battery_config->alert && ((time_left/60) <= battery_config->alert)) || 
+                                 (battery_config->alert_p && (full <= battery_config->alert_p)))
+                               )
+                              {
+                                 if (++debounce_popup == POPUP_DEBOUNCE_CYCLES)
+                                   _battery_warning_popup(inst, time_left, (double)full/100.0);
+                              }
+                            else if (have_power)
+                              _battery_warning_popup_destroy(inst);
+			 }
+		       if (!have_battery)
+			 e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+		       else
+			 {
+			    if ((have_power) || (full > 95))
+			      e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+			    else if (full > 30)
+			      e_powersave_mode_set(E_POWERSAVE_MODE_HIGH);
+			    else
+			      e_powersave_mode_set(E_POWERSAVE_MODE_EXTREME);
+			 }
+		    }
+		  else
+		    e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+		  battery_config->full = full;
+		  battery_config->time_left = time_left;
+		  battery_config->have_battery = have_battery;
+		  battery_config->have_power = have_power;
+	       }
+	  }
+     }
+   return 0;
+}                          
+
+static int
+_battery_cb_exe_del(void *data, int type, void *event)
+{
+   Ecore_Exe_Event_Del *ev;
+
+   ev = event;
+   if (ev->exe != battery_config->batget_exe) return 1;
+   battery_config->batget_exe = NULL;
+   return 1;
+}
diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h
index d233781..45e5fcb 100644
--- a/src/modules/battery/e_mod_main.h
+++ b/src/modules/battery/e_mod_main.h
@@ -7,57 +7,31 @@
 typedef struct _Config       Config;
 typedef struct _Status       Status;
 
-#define CHECK_NONE 0
-#define CHECK_ACPI 1
-#define CHECK_APM  2
-#define CHECK_PMU  3
+#define CHECK_NONE      0
+#define CHECK_ACPI      1
+#define CHECK_APM       2
+#define CHECK_PMU       3
+#define CHECK_SYS_ACPI  4
 
 struct _Config
 {
    /* saved * loaded config values */
    int              poll_interval;
-   int              alarm;	/* Alarm on minutes remaining */
-   int	            alarm_p;    /* Alarm on percentage remaining */
+   int              alert;	/* Alert on minutes remaining */
+   int	            alert_p;    /* Alert on percentage remaining */
+   int              alert_timeout;  /* Popup dismissal timeout */
    /* just config state */
    E_Module        *module;
    E_Config_Dialog *config_dialog;
    Evas_List       *instances;
    E_Menu          *menu;
-   int              alarm_triggered;
-   int              battery_check_mode;
-   Ecore_Poller    *battery_check_poller;
-   int              battery_prev_drain;
-   int              battery_prev_ac;
-   int              battery_prev_battery;
-   int              battery_prev_level;
-};
-
-#ifdef __FreeBSD__
-#define BATTERY_STATE_NONE 0
-#define BATTERY_STATE_DISCHARGING 1
-#define BATTERY_STATE_CHARGING 2
-#define BATTERY_STATE_REMOVED 7
-#else
-#define BATTERY_STATE_NONE 0
-#define BATTERY_STATE_CHARGING 1
-#define BATTERY_STATE_DISCHARGING 2
-#endif
-
-struct _Status
-{
-   /* Low battery */
-   unsigned char alarm;
-   /* Is there a battery? */
-   unsigned char has_battery;
-   /* charging, discharging, none */
-   unsigned char state;
-   /* Battery level */
-   double level;
-   /* Text */
-   /* reading == % left */
-   char *reading;
-   /* time == time left to empty / full */
-   char *time;
+   Ecore_Exe           *batget_exe;
+   Ecore_Event_Handler *batget_data_handler;
+   Ecore_Event_Handler *batget_del_handler;
+   int                  full;
+   int                  time_left;
+   int                  have_battery;
+   int                  have_power;
 };
 
 EAPI extern E_Module_Api e_modapi;
diff --git a/src/modules/battery/module.desktop b/src/modules/battery/module.desktop
index 278e214..b24a4e0 100644
--- a/src/modules/battery/module.desktop
+++ b/src/modules/battery/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Battery
 Name[de]=
+Name[eo]=Baterío
 Name[es]=Batería
 Name[fr]=
+Name[hu]=Akkumulátor
 Name[it]=
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-battery
 Comment=<hilight>Battery Gadget</hilight><br><br>A gadget to visualize your battery status.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de baterio</hilight><br><br>Vidigi staton de sia baterio.
 Comment[es]=<hilight>Dispositivo batería</hilight><br><br>Un dispositivo para ver el estado de su batería.
 Comment[fr]=
+Comment[hu]=<hilight>Akkumulátor modul</hilight><br><br>Nyomon követheted az akkumulátor töltöttségi szintjét.
 Comment[it]=<hilight>Modulo Battery</hilight><br><br>Un modulo per visualizzare lo stato della batteria.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop.in
index 278e214..b24a4e0 100644
--- a/src/modules/battery/module.desktop.in
+++ b/src/modules/battery/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Battery
 Name[de]=
+Name[eo]=Baterío
 Name[es]=Batería
 Name[fr]=
+Name[hu]=Akkumulátor
 Name[it]=
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-battery
 Comment=<hilight>Battery Gadget</hilight><br><br>A gadget to visualize your battery status.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de baterio</hilight><br><br>Vidigi staton de sia baterio.
 Comment[es]=<hilight>Dispositivo batería</hilight><br><br>Un dispositivo para ver el estado de su batería.
 Comment[fr]=
+Comment[hu]=<hilight>Akkumulátor modul</hilight><br><br>Nyomon követheted az akkumulátor töltöttségi szintjét.
 Comment[it]=<hilight>Modulo Battery</hilight><br><br>Un modulo per visualizzare lo stato della batteria.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/clock/Makefile.in b/src/modules/clock/Makefile.in
index e49a672..aa1e284 100644
--- a/src/modules/clock/Makefile.in
+++ b/src/modules/clock/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 6fffddc..4e091ac 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -79,10 +79,17 @@ static void
 _gc_orient(E_Gadcon_Client *gcc)
 {
    Instance *inst;
+   Evas_Coord mw, mh;
    
    inst = gcc->data;
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   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);
 }
 
 static char *
diff --git a/src/modules/clock/module.desktop b/src/modules/clock/module.desktop
index 784ba5f..14d01f3 100644
--- a/src/modules/clock/module.desktop
+++ b/src/modules/clock/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Clock
 Name[de]=
+Name[eo]=Horloĝo
 Name[es]=Reloj
 Name[fr]=
+Name[hu]=Óra
 Name[it]=
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-clock
 Comment=<hilight>Clock Gadget</hilight><br><br>Nice clock gadget to show current time.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de horloĝoj</hilight><br><br>Vidigi la nunan horon.
 Comment[es]=<hilight>Dispositivo Reloj</hilight><br><br>Un lindo reloj para mostrar la hora actual.
 Comment[fr]=
+Comment[hu]=<hilight>Óra modul</hilight><br><br>Egy szimpatikus, a pontos időt megjelenítő eszköz.
 Comment[it]=<hilight>Modulo Clock</hilight><br><br>Un simpatico orologio per mostrare l'ora attuale.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in
index 784ba5f..14d01f3 100644
--- a/src/modules/clock/module.desktop.in
+++ b/src/modules/clock/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Clock
 Name[de]=
+Name[eo]=Horloĝo
 Name[es]=Reloj
 Name[fr]=
+Name[hu]=Óra
 Name[it]=
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-clock
 Comment=<hilight>Clock Gadget</hilight><br><br>Nice clock gadget to show current time.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de horloĝoj</hilight><br><br>Vidigi la nunan horon.
 Comment[es]=<hilight>Dispositivo Reloj</hilight><br><br>Un lindo reloj para mostrar la hora actual.
 Comment[fr]=
+Comment[hu]=<hilight>Óra modul</hilight><br><br>Egy szimpatikus, a pontos időt megjelenítő eszköz.
 Comment[it]=<hilight>Modulo Clock</hilight><br><br>Un simpatico orologio per mostrare l'ora attuale.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf/Makefile.in b/src/modules/conf/Makefile.in
index a91d197..61ad0fd 100644
--- a/src/modules/conf/Makefile.in
+++ b/src/modules/conf/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 0b36e52..4b4b098 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -129,6 +129,8 @@ e_configure_show(E_Container *con)
    eco->edje = edje_object_add(eco->evas);
    e_theme_edje_object_set(eco->edje, "base/theme/configure", 
 			   "e/widgets/configure/main");
+   edje_object_part_text_set(eco->edje, "e.text.title", 
+			   _("Enlightenment Configuration"));
 
    eco->o_list = e_widget_list_add(eco->evas, 1, 1);
    edje_object_part_swallow(eco->edje, "e.swallow.content", eco->o_list);
diff --git a/src/modules/conf/module.desktop b/src/modules/conf/module.desktop
index 415539c..a0928c3 100644
--- a/src/modules/conf/module.desktop
+++ b/src/modules/conf/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration Panel
 Name[de]=
+Name[eo]=Panelo de agordado
 Name[es]=Panel de configuración
 Name[fr]=
+Name[hu]=E17 Vezérlőpult
 Name[it]=Pannello di configurazione
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf
 Comment=<hilight>The E17 Configuration Panel</hilight>
 Comment[de]=
+Comment[eo]=<hilight>La panelo de agordo de E17<hilight>
 Comment[es]=<hilight>El panel de configuración de E17</hilight>
 Comment[fr]=
+Comment[hu]=<hilight>Az E17 beállító központja</hilight>
 Comment[it]=<hilight>Il pannello di configurazione di E17</hilight>
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf/module.desktop.in b/src/modules/conf/module.desktop.in
index 415539c..a0928c3 100644
--- a/src/modules/conf/module.desktop.in
+++ b/src/modules/conf/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration Panel
 Name[de]=
+Name[eo]=Panelo de agordado
 Name[es]=Panel de configuración
 Name[fr]=
+Name[hu]=E17 Vezérlőpult
 Name[it]=Pannello di configurazione
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf
 Comment=<hilight>The E17 Configuration Panel</hilight>
 Comment[de]=
+Comment[eo]=<hilight>La panelo de agordo de E17<hilight>
 Comment[es]=<hilight>El panel de configuración de E17</hilight>
 Comment[fr]=
+Comment[hu]=<hilight>Az E17 beállító központja</hilight>
 Comment[it]=<hilight>Il pannello di configurazione di E17</hilight>
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_applications/Makefile.in b/src/modules/conf_applications/Makefile.in
index 7c929a3..d8746dc 100644
--- a/src/modules/conf_applications/Makefile.in
+++ b/src/modules/conf_applications/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_applications/module.desktop b/src/modules/conf_applications/module.desktop
index 4d86e8c..62b77b5 100644
--- a/src/modules/conf_applications/module.desktop
+++ b/src/modules/conf_applications/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Applications
 Name[de]=
+Name[eo]=Agordo - Aplikaĵoj
 Name[es]=Configuración - Aplicaciones
 Name[fr]=
+Name[hu]=Beállítások - Alkalmazások
 Name[it]=Configurazione - Applicazioni
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_applications
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows configuration of Ibar, Restart, and Startup applications.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la breton IBar, restartigajn kaj startigajn aplikaĵojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite configurar la IBar, reiniciar, e iniciar aplicaciones.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító eszköz</hilight><br><br>Itt beállíthatod az ibar, újraindítandó, automatikusan induló alkalmazásokat.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la configurazione delle applicazioni per l'avvio, il riavvio e la barra Ibar.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_applications/module.desktop.in b/src/modules/conf_applications/module.desktop.in
index 4d86e8c..62b77b5 100644
--- a/src/modules/conf_applications/module.desktop.in
+++ b/src/modules/conf_applications/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Applications
 Name[de]=
+Name[eo]=Agordo - Aplikaĵoj
 Name[es]=Configuración - Aplicaciones
 Name[fr]=
+Name[hu]=Beállítások - Alkalmazások
 Name[it]=Configurazione - Applicazioni
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_applications
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows configuration of Ibar, Restart, and Startup applications.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la breton IBar, restartigajn kaj startigajn aplikaĵojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite configurar la IBar, reiniciar, e iniciar aplicaciones.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító eszköz</hilight><br><br>Itt beállíthatod az ibar, újraindítandó, automatikusan induló alkalmazásokat.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la configurazione delle applicazioni per l'avvio, il riavvio e la barra Ibar.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_borders/Makefile.in b/src/modules/conf_borders/Makefile.in
index 5fb68d0..4572284 100644
--- a/src/modules/conf_borders/Makefile.in
+++ b/src/modules/conf_borders/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_borders/module.desktop b/src/modules/conf_borders/module.desktop
index 2a1d862..f7ae46f 100644
--- a/src/modules/conf_borders/module.desktop
+++ b/src/modules/conf_borders/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Borders
 Name[de]=
+Name[eo]=Agordo - Randoj
 Name[es]=Configuración - Bordes
 Name[fr]=
+Name[hu]=Beállítások - Ablakkeret
 Name[it]=Configurazione - Bordi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_borders
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select a default border style.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Elekti pravaloran randan stilon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>USado para elegir un diseño de borde predeterminado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beállíthatod az alapértelmezett ablakkeret stílust.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare uno stile di bordo predefinito.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in
index 2a1d862..f7ae46f 100644
--- a/src/modules/conf_borders/module.desktop.in
+++ b/src/modules/conf_borders/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Borders
 Name[de]=
+Name[eo]=Agordo - Randoj
 Name[es]=Configuración - Bordes
 Name[fr]=
+Name[hu]=Beállítások - Ablakkeret
 Name[it]=Configurazione - Bordi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_borders
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select a default border style.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Elekti pravaloran randan stilon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>USado para elegir un diseño de borde predeterminado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beállíthatod az alapértelmezett ablakkeret stílust.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare uno stile di bordo predefinito.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_clientlist/Makefile.in b/src/modules/conf_clientlist/Makefile.in
index d5199ff..6ff2d13 100644
--- a/src/modules/conf_clientlist/Makefile.in
+++ b/src/modules/conf_clientlist/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_clientlist/module.desktop b/src/modules/conf_clientlist/module.desktop
index 9c4214b..8f7d959 100644
--- a/src/modules/conf_clientlist/module.desktop
+++ b/src/modules/conf_clientlist/module.desktop
@@ -2,9 +2,11 @@
 Type=Link
 Name=Configuration - Client List Menu
 Name[de]=
-Name[es]=Configuración - Menú de lista de clientes
+Name[eo]=Agordo - Menuo de klienta listo
+Name[es]=Configuración - Menú de lista de clientes
 Name[fr]=
-Name[it]=Configurazione - Menù lista client
+Name[hu]=Beállítások - Ablaklista
+Name[it]=Configurazione - Menù lista client
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_clientlist
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows customization of the client list menu.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la personalización del menú de lista de clientes.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Adapti la menuon de klienta listo..
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la personalización del menú de lista de clientes.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la personalizzazione del menù con la lista dei client.
+Comment[hu]=<hilight>E17 Beállító alkalmazás</hilight><br><br>Itt az ablaklista beállításokat végezheted el.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la personalizzazione del menù con la lista dei client.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_clientlist/module.desktop.in b/src/modules/conf_clientlist/module.desktop.in
index 9c4214b..8f7d959 100644
--- a/src/modules/conf_clientlist/module.desktop.in
+++ b/src/modules/conf_clientlist/module.desktop.in
@@ -2,9 +2,11 @@
 Type=Link
 Name=Configuration - Client List Menu
 Name[de]=
-Name[es]=Configuración - Menú de lista de clientes
+Name[eo]=Agordo - Menuo de klienta listo
+Name[es]=Configuración - Menú de lista de clientes
 Name[fr]=
-Name[it]=Configurazione - Menù lista client
+Name[hu]=Beállítások - Ablaklista
+Name[it]=Configurazione - Menù lista client
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_clientlist
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows customization of the client list menu.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la personalización del menú de lista de clientes.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Adapti la menuon de klienta listo..
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la personalización del menú de lista de clientes.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la personalizzazione del menù con la lista dei client.
+Comment[hu]=<hilight>E17 Beállító alkalmazás</hilight><br><br>Itt az ablaklista beállításokat végezheted el.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la personalizzazione del menù con la lista dei client.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_colors/Makefile.in b/src/modules/conf_colors/Makefile.in
index 097c396..00e820e 100644
--- a/src/modules/conf_colors/Makefile.in
+++ b/src/modules/conf_colors/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_colors/module.desktop b/src/modules/conf_colors/module.desktop
index 51a2deb..9621888 100644
--- a/src/modules/conf_colors/module.desktop
+++ b/src/modules/conf_colors/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Colors
 Name[de]=
+Name[eo]=Agordo - Koloroj
 Name[es]=Configuración - Colores
 Name[fr]=
+Name[hu]=Beállítások - Színek
 Name[it]=Configurazione - Colori
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_colors
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to customize the color classes.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Adapti la kolorajn grupojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para personalizar las clases de colores.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt szín beállításokat végezhetsz.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per la personalizzazione delle classi di colore.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in
index 51a2deb..9621888 100644
--- a/src/modules/conf_colors/module.desktop.in
+++ b/src/modules/conf_colors/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Colors
 Name[de]=
+Name[eo]=Agordo - Koloroj
 Name[es]=Configuración - Colores
 Name[fr]=
+Name[hu]=Beállítások - Színek
 Name[it]=Configurazione - Colori
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_colors
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to customize the color classes.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Adapti la kolorajn grupojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para personalizar las clases de colores.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt szín beállításokat végezhetsz.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per la personalizzazione delle classi di colore.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_desk/Makefile.in b/src/modules/conf_desk/Makefile.in
index 82c6954..ae299ea 100644
--- a/src/modules/conf_desk/Makefile.in
+++ b/src/modules/conf_desk/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_desk/module.desktop b/src/modules/conf_desk/module.desktop
index 43ce8e9..76b393a 100644
--- a/src/modules/conf_desk/module.desktop
+++ b/src/modules/conf_desk/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Desk
 Name[de]=
+Name[eo]=Agordo - Labortablo
 Name[es]=Configuración - Escritorio
 Name[fr]=
+Name[hu]=Beállítások - Munkaasztal
 Name[it]=Configurazione - Desktop
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_desk
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the desktop name and wallpaper for individual virtual desktops.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la labortablan nomon kaj etoson por ĉiu virtuala labortablo.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar el nombre del escritorio y los fondos de pantalla para cada escritorio virtual individualmente.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt a munkaasztalod beállításait végezheted el. Beállíthatod a háttérképet és kezelheted a virtuális munkaasztalokat.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare il nome e lo sfondo per ogni singolo desktop virtuale.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
index 43ce8e9..76b393a 100644
--- a/src/modules/conf_desk/module.desktop.in
+++ b/src/modules/conf_desk/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Desk
 Name[de]=
+Name[eo]=Agordo - Labortablo
 Name[es]=Configuración - Escritorio
 Name[fr]=
+Name[hu]=Beállítások - Munkaasztal
 Name[it]=Configurazione - Desktop
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_desk
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the desktop name and wallpaper for individual virtual desktops.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la labortablan nomon kaj etoson por ĉiu virtuala labortablo.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar el nombre del escritorio y los fondos de pantalla para cada escritorio virtual individualmente.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt a munkaasztalod beállításait végezheted el. Beállíthatod a háttérképet és kezelheted a virtuális munkaasztalokat.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare il nome e lo sfondo per ogni singolo desktop virtuale.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_desklock/Makefile.in b/src/modules/conf_desklock/Makefile.in
index 9006f21..f3726d3 100644
--- a/src/modules/conf_desklock/Makefile.in
+++ b/src/modules/conf_desklock/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_desklock/module.desktop b/src/modules/conf_desklock/module.desktop
index 1d1c190..19b1c55 100644
--- a/src/modules/conf_desklock/module.desktop
+++ b/src/modules/conf_desklock/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Lock
 Name[de]=
+Name[eo]=Agordo - Ekranŝlosilo
 Name[es]=Configuración - Bloqueo de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Képernyő zárolása
 Name[it]=Configurazione - Bloccaschermo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_desklock
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures the integrated desk lock.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la integritan labortablan ŝlosilon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el bloqueador de escritorio integrado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A beépített asztal zároló beállításai.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il bloccaschermo integrato.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
index 1d1c190..19b1c55 100644
--- a/src/modules/conf_desklock/module.desktop.in
+++ b/src/modules/conf_desklock/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Lock
 Name[de]=
+Name[eo]=Agordo - Ekranŝlosilo
 Name[es]=Configuración - Bloqueo de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Képernyő zárolása
 Name[it]=Configurazione - Bloccaschermo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_desklock
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures the integrated desk lock.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la integritan labortablan ŝlosilon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el bloqueador de escritorio integrado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A beépített asztal zároló beállításai.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il bloccaschermo integrato.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_desks/Makefile.in b/src/modules/conf_desks/Makefile.in
index 53fdd19..c81ad2d 100644
--- a/src/modules/conf_desks/Makefile.in
+++ b/src/modules/conf_desks/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_desks/module.desktop b/src/modules/conf_desks/module.desktop
index 936d351..3a88e65 100644
--- a/src/modules/conf_desks/module.desktop
+++ b/src/modules/conf_desks/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Virtual Desktops
 Name[de]=
-Name[es]=Configuración - Escritorios virtuales
+Name[eo]=Agordo - Virtualaj labortabloj
+Name[es]=Configuración - Escritorios virtuales
 Name[fr]=
+Name[hu]=Beállítások - Virtuális munkaasztalok
 Name[it]=Configurazione - Desktop virtuali
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_desks
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure the virtual desktop properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de los escritorios virtuales.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la ecojn de la virtualaj labortablaj.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de los escritorios virtuales.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà dei desktop virtuali.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Virtuális munkaasztalok beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà dei desktop virtuali.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
index 936d351..3a88e65 100644
--- a/src/modules/conf_desks/module.desktop.in
+++ b/src/modules/conf_desks/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Virtual Desktops
 Name[de]=
-Name[es]=Configuración - Escritorios virtuales
+Name[eo]=Agordo - Virtualaj labortabloj
+Name[es]=Configuración - Escritorios virtuales
 Name[fr]=
+Name[hu]=Beállítások - Virtuális munkaasztalok
 Name[it]=Configurazione - Desktop virtuali
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_desks
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure the virtual desktop properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de los escritorios virtuales.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la ecojn de la virtualaj labortablaj.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de los escritorios virtuales.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà dei desktop virtuali.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Virtuális munkaasztalok beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà dei desktop virtuali.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_dialogs/Makefile.in b/src/modules/conf_dialogs/Makefile.in
index 44a462f..df593b4 100644
--- a/src/modules/conf_dialogs/Makefile.in
+++ b/src/modules/conf_dialogs/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_dialogs/module.desktop b/src/modules/conf_dialogs/module.desktop
index 3fb6b3f..87ad81c 100644
--- a/src/modules/conf_dialogs/module.desktop
+++ b/src/modules/conf_dialogs/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Dialogs
 Name[de]=
-Name[es]=Configuración - Diálogos
+Name[eo]=Agordo - Dialogoj
+Name[es]=Configuración - Diálogos
 Name[fr]=
+Name[hu]=Beállítások - Párbeszédablakok
 Name[it]=Configurazione - Finestre di dialogo
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_dialogs
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure default dialog properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de los diálogos.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la defaŭltajn ecojn de dialogoj.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de los diálogos.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite per le finestre di dialogo.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett bárbeszédablak beállítások.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite per le finestre di dialogo.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index 3fb6b3f..87ad81c 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Dialogs
 Name[de]=
-Name[es]=Configuración - Diálogos
+Name[eo]=Agordo - Dialogoj
+Name[es]=Configuración - Diálogos
 Name[fr]=
+Name[hu]=Beállítások - Párbeszédablakok
 Name[it]=Configurazione - Finestre di dialogo
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_dialogs
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure default dialog properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de los diálogos.
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la defaŭltajn ecojn de dialogoj.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de los diálogos.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite per le finestre di dialogo.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett bárbeszédablak beállítások.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite per le finestre di dialogo.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_display/Makefile.in b/src/modules/conf_display/Makefile.in
index dcfa867..4e5dd5d 100644
--- a/src/modules/conf_display/Makefile.in
+++ b/src/modules/conf_display/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_display/module.desktop b/src/modules/conf_display/module.desktop
index 91307c1..d49a3cd 100644
--- a/src/modules/conf_display/module.desktop
+++ b/src/modules/conf_display/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Resolution
 Name[de]=
+Name[eo]=Agordo - Ekrandistingivo
 Name[es]=Configuración - Resolución de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Képernyő felbontása
 Name[it]=Configurazione - Risoluzione schermo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_display
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your screen's resolution.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi sian ekrandistingivon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar su resolución de pantalla.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Segítségével beállíthatod a képernyőd felbontását.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare la risoluzione del vostro schermo.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index 91307c1..d49a3cd 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Resolution
 Name[de]=
+Name[eo]=Agordo - Ekrandistingivo
 Name[es]=Configuración - Resolución de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Képernyő felbontása
 Name[it]=Configurazione - Risoluzione schermo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_display
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your screen's resolution.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi sian ekrandistingivon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar su resolución de pantalla.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Segítségével beállíthatod a képernyőd felbontását.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare la risoluzione del vostro schermo.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_dpms/Makefile.in b/src/modules/conf_dpms/Makefile.in
index 38c72a5..04bcec8 100644
--- a/src/modules/conf_dpms/Makefile.in
+++ b/src/modules/conf_dpms/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_dpms/module.desktop b/src/modules/conf_dpms/module.desktop
index 0a035f2..a8dc740 100644
--- a/src/modules/conf_dpms/module.desktop
+++ b/src/modules/conf_dpms/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Power Management
 Name[de]=
+Name[eo]=Agordo - Potenca Administrado
 Name[es]=Configuración - Administración de energía
 Name[fr]=
+Name[hu]=Beállítások - Energiakezelés
 Name[it]=Configurazione - Gestione energetica
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_dpms
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure the DPMS settings of your system.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la parametrojn de DPMS (Signalado de potenca administrado de ekrano) de sia sistemo.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las opciones de DPMS de su sistema.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>DPMS beállítások elvégzése.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le impostazioni DPMS del vostro sistema.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
index 0a035f2..a8dc740 100644
--- a/src/modules/conf_dpms/module.desktop.in
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Power Management
 Name[de]=
+Name[eo]=Agordo - Potenca Administrado
 Name[es]=Configuración - Administración de energía
 Name[fr]=
+Name[hu]=Beállítások - Energiakezelés
 Name[it]=Configurazione - Gestione energetica
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_dpms
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure the DPMS settings of your system.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la parametrojn de DPMS (Signalado de potenca administrado de ekrano) de sia sistemo.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las opciones de DPMS de su sistema.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>DPMS beállítások elvégzése.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le impostazioni DPMS del vostro sistema.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_engine/Makefile.in b/src/modules/conf_engine/Makefile.in
index 10d634f..32c9601 100644
--- a/src/modules/conf_engine/Makefile.in
+++ b/src/modules/conf_engine/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c
index 31f652b..0a700b6 100644
--- a/src/modules/conf_engine/e_int_config_engine.c
+++ b/src/modules/conf_engine/e_int_config_engine.c
@@ -97,6 +97,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
         if (!strcmp("SOFTWARE", l->data)) engine = E_EVAS_ENGINE_SOFTWARE_X11;
         else if (!strcmp("GL", l->data)) engine = E_EVAS_ENGINE_GL_X11;
         else if (!strcmp("XRENDER", l->data)) engine = E_EVAS_ENGINE_XRENDER_X11;
+        else if (!strcmp("SOFTWARE_16", l->data)) engine = E_EVAS_ENGINE_SOFTWARE_X11_16;
 	else continue;
         ob = e_widget_radio_add(evas, _(l->data), engine, rg);
         e_widget_framelist_object_append(of, ob);
diff --git a/src/modules/conf_engine/module.desktop b/src/modules/conf_engine/module.desktop
index 53ab968..a15cf1c 100644
--- a/src/modules/conf_engine/module.desktop
+++ b/src/modules/conf_engine/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Engine
 Name[de]=
+Name[eo]=Agordo - Motoro
 Name[es]=Configuración - Motor
 Name[fr]=
+Name[hu]=Beállítások - Meghajtó
 Name[it]=Configurazione - Motore
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_engine
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select the rendering engine.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Elekti la bildigan motoron.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para seleccionar el motor de renderizado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A megjelenítő motor (rendering engine) kiválasztása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionere il motore di rendering.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
index 53ab968..a15cf1c 100644
--- a/src/modules/conf_engine/module.desktop.in
+++ b/src/modules/conf_engine/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Engine
 Name[de]=
+Name[eo]=Agordo - Motoro
 Name[es]=Configuración - Motor
 Name[fr]=
+Name[hu]=Beállítások - Meghajtó
 Name[it]=Configurazione - Motore
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_engine
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select the rendering engine.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Elekti la bildigan motoron.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para seleccionar el motor de renderizado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A megjelenítő motor (rendering engine) kiválasztása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionere il motore di rendering.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_exebuf/Makefile.in b/src/modules/conf_exebuf/Makefile.in
index 4115f07..1888b6d 100644
--- a/src/modules/conf_exebuf/Makefile.in
+++ b/src/modules/conf_exebuf/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_exebuf/module.desktop b/src/modules/conf_exebuf/module.desktop
index d49926d..8865fac 100644
--- a/src/modules/conf_exebuf/module.desktop
+++ b/src/modules/conf_exebuf/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Run Command
 Name[de]=
+Name[eo]=Agordo - Lanĉi komandon
 Name[es]=Configuración - Ejecutar comando
 Name[fr]=
+Name[hu]=Beállítások - Parancs futtatása
 Name[it]=Configurazione - Lanciacomandi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_exebuf
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the settings of the run command GUI.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la parametrojn de la uzulinterfaco por la lanĉo de komandoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar las opciones de la GUI para ejecutar un comando.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt beállíthadot a "Parancs futtatása" ablak tulajdonságait.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le impostazioni della GUI per l'esecuzione di comandi.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_exebuf/module.desktop.in b/src/modules/conf_exebuf/module.desktop.in
index d49926d..8865fac 100644
--- a/src/modules/conf_exebuf/module.desktop.in
+++ b/src/modules/conf_exebuf/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Run Command
 Name[de]=
+Name[eo]=Agordo - Lanĉi komandon
 Name[es]=Configuración - Ejecutar comando
 Name[fr]=
+Name[hu]=Beállítások - Parancs futtatása
 Name[it]=Configurazione - Lanciacomandi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_exebuf
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the settings of the run command GUI.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Agordi la parametrojn de la uzulinterfaco por la lanĉo de komandoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar las opciones de la GUI para ejecutar un comando.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Itt beállíthadot a "Parancs futtatása" ablak tulajdonságait.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le impostazioni della GUI per l'esecuzione di comandi.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_fonts/Makefile.in b/src/modules/conf_fonts/Makefile.in
index 1433a56..9908a29 100644
--- a/src/modules/conf_fonts/Makefile.in
+++ b/src/modules/conf_fonts/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index 5b84906..2fbe77f 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -31,6 +31,8 @@ static void _size_list_load(E_Config_Dialog_Data *cfdata, Evas_List *size_list,
 static void _class_list_load(E_Config_Dialog_Data *cfdata);
 static void _font_preview_update(E_Config_Dialog_Data *cfdata);
 
+static Evas_Bool _font_hash_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
+
 struct _E_Font_Size_Data
 {
    E_Config_Dialog_Data *cfdata;
@@ -88,11 +90,12 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
      { "tlist",           N_("Text List Item")},
      { "ilist_item",	  N_("List Item")},
      { "ilist_header",    N_("List Header")},
-   
+
      {  NULL,		  N_("Filemanager")},
      { "fileman_typebuf", N_("Typebuf")},
      { "fileman_icon",    N_("Icon")},
-   
+     { "desktop_icon",    N_("Desktop Icon")},
+
      {  NULL,		  N_("Modules")},
      { "module_small",    N_("Small")},
      { "module_normal",   N_("Normal")},
@@ -185,18 +188,19 @@ _fill_data(E_Config_Dialog_Data *cfdata)
      {
 	tc = E_NEW(CFText_Class, 1);	
 	tc->class_name = text_class_predefined_names[i].class_name;
-	tc->class_description = _(text_class_predefined_names[i].class_description);
+	tc->class_description = 
+          _(text_class_predefined_names[i].class_description);
 	tc->font = NULL;
 	tc->size = 0;
 	tc->enabled = 0;
-		
+
 	if (text_class_predefined_names[i].class_name)
 	  {
 	     /* Search manually because we dont want to fallback */
 	     for (next = font_list; next ; next = next->next)
 	       {
 		  efd = next->data;
-		  
+
 		  if (!strcmp(tc->class_name, efd->text_class))
 		    {
 		       if (efd->font) 
@@ -214,7 +218,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 		       tc->enabled = 1;
 		    }
 	       }
-	     
+
 	     if (!tc->enabled)
 	       {
 		  /* search with default fallbacks */
@@ -236,11 +240,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 		    }
 	       }
 	  }
-	
+
 	/* Append the class */
 	cfdata->text_classes = evas_list_append(cfdata->text_classes, tc);
      }
-   
+
    /* Fill Hinting */
    cfdata->hinting = e_config->font_hinting;
 
@@ -314,7 +318,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_font_available_hash_free(cfdata->font_hash);
    while (cfdata->font_list)
      cfdata->font_list = evas_list_remove_list(cfdata->font_list, cfdata->font_list);
-   
+
    while ((l = cfdata->text_classes))
      {
         CFText_Class *tc;
@@ -325,7 +329,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	if (tc->style) evas_stringshare_del(tc->style);
         E_FREE(tc);
      }
-     
+
    while ((l = cfdata->font_scale_list))
      {
         E_Font_Size_Data *size_data;
@@ -345,7 +349,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
         if (size_data->size_str) evas_stringshare_del(size_data->size_str);
         E_FREE(size_data);
      }
-   
+
    E_FREE(cfdata->cur_font);
    E_FREE(cfdata->cur_style);
    E_FREE(cfdata);
@@ -370,7 +374,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	     const char *font_name;
 
 	     class_name = text_class_predefined_names[i].class_name;
-	     font_name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
+	     font_name = 
+               e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
 	     e_font_default_set(class_name, font_name, cfdata->cur_size);
 
 	     if (i == 1)
@@ -402,7 +407,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	  tc->font = evas_stringshare_add(cfdata->cur_font);
 	else
 	  tc->font = NULL;
-	
+
 	if (tc->style) evas_stringshare_del(tc->style);
 	if (cfdata->cur_style)
 	  tc->style = evas_stringshare_add(cfdata->cur_style);
@@ -415,7 +420,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static Evas_Bool
-_font_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_font_hash_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
 {
    E_Config_Dialog_Data *cfdata;
    E_Font_Properties *efp;
@@ -431,7 +436,7 @@ static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *ot, *ob, *of;
-      
+
    cfdata->cur_index = -1;
    cfdata->evas = evas;
 
@@ -439,7 +444,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    cfdata->gui.class_list = NULL;
 
-   ob = e_widget_check_add(evas, _("Enable Custom Font Classes"), &(cfdata->cur_enabled));
+   ob = e_widget_check_add(evas, _("Enable Custom Font Classes"), 
+                           &(cfdata->cur_enabled));
    cfdata->gui.enabled = ob;
    e_widget_on_change_hook_set(ob, _basic_enable_cb_change, cfdata);
    e_widget_disabled_set(ob, 0);
@@ -461,7 +467,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
 
-   ob = e_widget_font_preview_add(evas, _("Basic preview text: 123: 我的天空!"));
+   ob = 
+     e_widget_font_preview_add(evas, _("Basic preview text: 123: 我的天空!"));
    cfdata->gui.preview = ob;
    e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 1, 0, 1, 0);
 
@@ -475,10 +482,9 @@ static void
 _basic_font_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    if (!cfdata) return;
-
    _font_preview_update(cfdata);
 }
 
@@ -486,7 +492,7 @@ static void
 _basic_enable_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    if (!cfdata) return;
 
@@ -538,7 +544,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
 
    /* Populate font list (Select current font) */
    _font_list_load(cfdata, init_font);
-   
+
    /* Populate size list (Select current font) */
    _size_list_load(cfdata, cfdata->font_scale_list, init_size, 1);
 }
@@ -549,7 +555,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    int i;
    Evas_List *next;
    CFText_Class *tc;
-  
+
    /* Save current data */
    if (cfdata->cur_index >= 0)
      {
@@ -580,20 +586,21 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
    /* Fallbacks configure */
    e_font_fallback_clear();
-   
+
    if (cfdata->cur_fallbacks_enabled)
      {
 	for (i = 0; i < e_widget_config_list_count(cfdata->gui.fallback_list); i++)
 	  {
 	     const char *fallback;
 
-	     fallback = e_widget_config_list_nth_get(cfdata->gui.fallback_list, i);
+	     fallback = 
+               e_widget_config_list_nth_get(cfdata->gui.fallback_list, i);
 	     if ((fallback) && (fallback[0]))
 	       e_font_fallback_append(fallback);
 	  }
      }
    e_font_apply();
-   
+
    /* Apply Hinting */
    e_config->font_hinting = cfdata->hinting;
    e_config_save_queue();
@@ -612,7 +619,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    cfdata->cur_index = -1;
    cfdata->evas = evas;
- 
+
    ot = e_widget_table_add(evas, 0);
    of = e_widget_frametable_add(evas, _("Font Classes"), 0);
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
@@ -646,7 +653,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_min_size_set(ob, 90, 90);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1);
-  
+
    of = e_widget_framelist_add(evas, _("Size"), 1);
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->gui.size_list = ob;
@@ -679,7 +686,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    for (next = e_font_fallback_list(); next; next = next->next)
      {
 	E_Font_Fallback *eff;
-	
+
 	eff = next->data;
 	e_widget_config_list_append(ob, eff->name);
 	option_enable = 1;
@@ -692,7 +699,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_check_checked_set(ob, option_enable);
    e_widget_change(ob);
    e_widget_table_object_append(ot, of, 3, 1, 1, 2, 1, 1, 1, 1);
-   
+
    ob = e_widget_font_preview_add(evas, _("Advanced Preview Text.. 我真的会写中文"));
    cfdata->gui.preview = ob;
    e_widget_table_object_append(ot, ob, 0, 3, 4, 1, 1, 0, 1, 0);
@@ -707,20 +714,20 @@ _class_list_load(E_Config_Dialog_Data *cfdata)
 {
    Evas *evas;
    Evas_List *next;
-   
+
    if (!cfdata->gui.class_list) return;
    evas = evas_object_evas_get(cfdata->gui.class_list);
    evas_event_freeze(evas);
    edje_freeze();
    e_widget_ilist_freeze(cfdata->gui.class_list);
    e_widget_ilist_clear(cfdata->gui.class_list);
-   
+
    /* Fill in Class Ilist */
    for (next = cfdata->text_classes; next; next = next->next)
      {
 	CFText_Class *tc;
 	Evas_Object *ic;
-	
+
 	tc = next->data;
 	if (tc)
 	  {
@@ -752,10 +759,9 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
    int indx;
    E_Config_Dialog_Data *cfdata;
    CFText_Class *tc;
-   
-   cfdata = data;
-   if (!cfdata) return;
-   
+
+   if (!(cfdata = data)) return;
+
    /* Save Current */
    if (cfdata->cur_index >= 0)
      {
@@ -777,7 +783,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
 	if (cfdata->gui.size_list)
 	  e_widget_ilist_unselect(cfdata->gui.size_list);
      }
-   
+
    /* If no class is selected unselect all and return */
    indx = e_widget_ilist_selected_get(cfdata->gui.class_list);
    if (indx < 0) 
@@ -790,7 +796,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
 	  e_widget_ilist_unselect(cfdata->gui.font_list);
 	return;
      }
-   
+
    tc = evas_list_nth(cfdata->text_classes, indx);
    cfdata->cur_index = indx;
 
@@ -805,7 +811,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
 	for (indx = 0; indx < e_widget_ilist_count(cfdata->gui.font_list); indx++) 
 	  {
 	     const char *f;
-	     
+
 	     f = e_widget_ilist_nth_label_get(cfdata->gui.font_list, indx);
 	     if (tc->font && !strcasecmp(f, tc->font)) 
 	       {  
@@ -822,13 +828,12 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
    E_Config_Dialog_Data *cfdata;
    Evas_List *l;
    int n;
-   
-   cfdata = data;   
-   if (!cfdata) return;
+
+   if (!(cfdata = data)) return;
    e_widget_disabled_set(cfdata->gui.font_list, !cfdata->cur_enabled);
    e_widget_disabled_set(cfdata->gui.style_list, !cfdata->cur_enabled);
    e_widget_disabled_set(cfdata->gui.size_list, !cfdata->cur_enabled);
-  
+
    /* Search class list fot selected and enable Icon */ 
    for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) 
      {
@@ -836,8 +841,7 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
 	Evas_Object *icon = NULL;
 	CFText_Class *tc;
 
-	i = l->data;
-	if (!i) continue;
+        if (!(i = l->data)) continue;
 	if (!i->selected) continue;
 
 	tc = evas_list_nth(cfdata->text_classes, n);
@@ -862,10 +866,9 @@ _size_cb_change(void *data)
    E_Font_Size_Data *size_data;
    Evas_List *l;
    int n;
-   
+
    size_data = data;
-   cfdata = size_data->cfdata;
-   if (!cfdata) return;
+   if (!(cfdata = size_data->cfdata)) return;
 
    cfdata->cur_size = size_data->size;
 
@@ -878,8 +881,7 @@ _size_cb_change(void *data)
 	E_Ilist_Item *i;
 	CFText_Class *tc;
 
-	i = l->data;
-	if (!i) continue;
+        if (!(i = l->data)) continue;
 	if (!i->selected) continue;
 
 	tc = evas_list_nth(cfdata->text_classes, n);
@@ -894,18 +896,16 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
    CFText_Class *tc;
    Evas_List *l;
    int n;
-   
+
    tc = NULL;
-   cfdata = data;
-   if (!cfdata) return;
- 
+   if (!(cfdata = data)) return;
+
    /* Set up the new font name for each selected class */
    for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) 
      {
 	E_Ilist_Item *i;
-	
-	i = l->data;
-	if (!i) continue;
+
+        if (!(i = l->data)) continue;
 	if (!i->selected) continue;
 
 	tc = evas_list_nth(cfdata->text_classes, n);
@@ -924,14 +924,15 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
 	evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list));
 	edje_freeze();
 	e_widget_ilist_freeze(cfdata->gui.style_list);
-
 	e_widget_ilist_clear(cfdata->gui.style_list);
+
 	for (next = efp->styles; next; next = next->next)
 	  {
 	     const char *style;
 
 	     style = next->data;
-	     e_widget_ilist_append(cfdata->gui.style_list, NULL, style, NULL, NULL, style);
+	     e_widget_ilist_append(cfdata->gui.style_list, NULL, style, 
+                                   NULL, NULL, style);
 	  }
 
 	e_widget_ilist_go(cfdata->gui.style_list);
@@ -946,7 +947,7 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
 	for (n = 0; n < e_widget_ilist_count(cfdata->gui.style_list); n++) 
 	  {
 	     const char *f;
-	     
+
 	     f = e_widget_ilist_nth_label_get(cfdata->gui.style_list, n);
 	     if (!strcasecmp(f, tc->style)) 
 	       {  
@@ -982,6 +983,7 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Evas_List *size_list, Evas_Font_Si
    edje_freeze();	
    e_widget_ilist_freeze(ob);
    if (clear) e_widget_ilist_clear(ob);
+
    for (next = size_list; next; next = next->next)	  
      {     
 	E_Font_Size_Data *size_data;
@@ -990,7 +992,7 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Evas_List *size_list, Evas_Font_Si
 	e_widget_ilist_append(ob, NULL, size_data->size_str, _size_cb_change, 
 			      size_data, NULL);     
      }
-	
+
    e_widget_ilist_go(ob);	
    e_widget_ilist_thaw(ob);	
    edje_thaw();
@@ -999,7 +1001,7 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Evas_List *size_list, Evas_Font_Si
    for (n = 0; n < e_widget_ilist_count(ob); n++) 	  
      {
        E_Font_Size_Data *size_data;
-      
+
        size_data = e_widget_ilist_nth_data_get(ob, n); 
        if (cur_size == size_data->size)
 	  {
@@ -1029,15 +1031,16 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
    if (cfdata->font_hash == NULL)
      {
 	Evas_List *fonts;
-	
+
 	fonts = evas_font_available_list(evas);
 	cfdata->font_hash = e_font_available_list_parse(fonts);
 	evas_hash_foreach(cfdata->font_hash, _font_hash_cb, cfdata);
 	if (cfdata->font_list)
 	  {
-	     cfdata->font_list = evas_list_sort(cfdata->font_list, 
-						evas_list_count(cfdata->font_list), 
-						_sort_fonts);
+	     cfdata->font_list = 
+               evas_list_sort(cfdata->font_list, 
+                              evas_list_count(cfdata->font_list), 
+                              _sort_fonts);
 	  }
 	evas_font_available_list_free(evas, fonts);
      }
@@ -1050,12 +1053,12 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
 	for (next = cfdata->font_list; next; next = next->next) 
 	  {
 	     const char *f;
-	     
+
 	     f = next->data;
 	     e_widget_ilist_append(ob, NULL, f, NULL, NULL, f);
 	  }
      }
-   
+
    e_widget_ilist_go(ob);
    e_widget_min_size_get(ob, &w, NULL);
    e_widget_min_size_set(ob, w, 250);
@@ -1070,9 +1073,9 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
    for (next = cfdata->font_list; next; next = next->next) 
      {
 	const char *f;
-	     
+
 	f = next->data;
-	if (cur_font && !strcasecmp(f, cur_font)) 
+	if ((cur_font) && (!strcasecmp(f, cur_font)))
 	  {  
 	     e_widget_ilist_selected_set(ob, n);
 	     break;
@@ -1087,18 +1090,16 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
    E_Config_Dialog_Data *cfdata;
    Evas_List *l;
    int n;
-   
-   cfdata = data;
-   if (!cfdata) return;
-   
+
+   if (!(cfdata = data)) return;
+
    /* Setup the new style name */
    for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) 
      {
 	E_Ilist_Item *i;
 	CFText_Class *tc;
 
-	i = l->data;
-	if (!i) continue;
+        if (!(i = l->data)) continue;
 	if (!i->selected) continue;
 
 	tc = evas_list_nth(cfdata->text_classes, n);
@@ -1117,11 +1118,10 @@ static void
 _adv_enabled_fallback_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
-   
-   cfdata = data;
-   if (!cfdata) return;
-  
-   e_widget_disabled_set(cfdata->gui.fallback_list, !cfdata->cur_fallbacks_enabled); 
+
+   if (!(cfdata = data)) return;
+   e_widget_disabled_set(cfdata->gui.fallback_list, 
+                         !cfdata->cur_fallbacks_enabled); 
 }
 
 static int 
@@ -1129,7 +1129,6 @@ _sort_fonts(void *data1, void *data2)
 {
    if (!data1) return 1;
    if (!data2) return -1;
-   
    return e_util_strcmp(data1, data2);
 }
 
@@ -1142,7 +1141,8 @@ _font_preview_update(E_Config_Dialog_Data *cfdata)
 	const char *name;     
 
 	name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
-	e_widget_font_preview_font_set(cfdata->gui.preview, name, cfdata->cur_size);     
+	e_widget_font_preview_font_set(cfdata->gui.preview, name, 
+                                       cfdata->cur_size);
 	evas_stringshare_del(name);
      }
 }
diff --git a/src/modules/conf_fonts/module.desktop b/src/modules/conf_fonts/module.desktop
index 94e1b92..5f44c71 100644
--- a/src/modules/conf_fonts/module.desktop
+++ b/src/modules/conf_fonts/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Fonts
 Name[de]=
+Name[eo]=Agordo - Tiparoj
 Name[es]=Configuración - Fuentes
 Name[fr]=
+Name[hu]=Beállítások - Betűtípusok
 Name[it]=Configurazione - Font
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_fonts
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Font configuration dialog.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Dialogo de agordo de tiparoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Diálogo de configuración de fuentes.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Kiválaszthatod a számodra legmegfelellőbb betűtípust.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Interfaccia per la configurazione dei font.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in
index 94e1b92..5f44c71 100644
--- a/src/modules/conf_fonts/module.desktop.in
+++ b/src/modules/conf_fonts/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Fonts
 Name[de]=
+Name[eo]=Agordo - Tiparoj
 Name[es]=Configuración - Fuentes
 Name[fr]=
+Name[hu]=Beállítások - Betűtípusok
 Name[it]=Configurazione - Font
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_fonts
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Font configuration dialog.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17-agordo</hilight><br><br>Dialogo de agordo de tiparoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Diálogo de configuración de fuentes.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Kiválaszthatod a számodra legmegfelellőbb betűtípust.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Interfaccia per la configurazione dei font.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_icon_theme/Makefile.in b/src/modules/conf_icon_theme/Makefile.in
index 0080ea0..d5b9eba 100644
--- a/src/modules/conf_icon_theme/Makefile.in
+++ b/src/modules/conf_icon_theme/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_icon_theme/module.desktop b/src/modules/conf_icon_theme/module.desktop
index 43ca912..51453c1 100644
--- a/src/modules/conf_icon_theme/module.desktop
+++ b/src/modules/conf_icon_theme/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Icon Theme
 Name[de]=
+Name[eo]=Agordo - Piktograma etoso
 Name[es]=Configuración - Tema de íconos
 Name[fr]=
+Name[hu]=Beállítások - Ikon téma
 Name[it]=Configurazione - Temi di icone
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_icon_theme
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configuration applet used to select an icon theme for E17.
 Comment[de]=
+Comment[eo]=<hilight>Aplikajeto de E17-agordo</hilight><br><br>Elekti piktograman etoson por E17.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Applet de configuración usado para seleccionar el tema de íconos para E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beállíthadod, hogy milyen ikon témát használjon az E17.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Applet di configurazione per la selezione di un tema di icone per E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
index 43ca912..51453c1 100644
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Icon Theme
 Name[de]=
+Name[eo]=Agordo - Piktograma etoso
 Name[es]=Configuración - Tema de íconos
 Name[fr]=
+Name[hu]=Beállítások - Ikon téma
 Name[it]=Configurazione - Temi di icone
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_icon_theme
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configuration applet used to select an icon theme for E17.
 Comment[de]=
+Comment[eo]=<hilight>Aplikajeto de E17-agordo</hilight><br><br>Elekti piktograman etoson por E17.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Applet de configuración usado para seleccionar el tema de íconos para E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beállíthadod, hogy milyen ikon témát használjon az E17.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Applet di configurazione per la selezione di un tema di icone per E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_imc/Makefile.in b/src/modules/conf_imc/Makefile.in
index 462b358..5552091 100644
--- a/src/modules/conf_imc/Makefile.in
+++ b/src/modules/conf_imc/Makefile.in
@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -105,6 +107,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -124,6 +127,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -149,6 +154,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index 5c1effe..6976515 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -36,8 +36,8 @@ static void         _e_imc_change_enqueue    (E_Config_Dialog_Data *cfdata);
 static void         _e_imc_entry_change_cb   (void *data, Evas_Object *obj);
 static void	    _e_imc_form_fill         (E_Config_Dialog_Data *cfdata);
 static const char*  _e_imc_file_name_new_get (void);
-static Evas_Bool    _change_hash_free_cb     (Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool    _change_hash_apply_cb    (Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool    _change_hash_free_cb     (const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__);
+static Evas_Bool    _change_hash_apply_cb    (const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata __UNUSED__);
 
 struct _E_Config_Dialog_Data
 {
@@ -143,7 +143,7 @@ _create_data(E_Config_Dialog *cfd)
 }
 
 static Evas_Bool 
-_change_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_change_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    E_Input_Method_Config *imc;
 
@@ -385,7 +385,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
 /*** Start Advanced Dialog Logic ***/
 static Evas_Bool 
-_change_hash_apply_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_change_hash_apply_cb(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata __UNUSED__)
 {
    E_Input_Method_Config *imc;
    Eet_File *ef;
diff --git a/src/modules/conf_imc/module.desktop b/src/modules/conf_imc/module.desktop
index 70ee429..b34af88 100644
--- a/src/modules/conf_imc/module.desktop
+++ b/src/modules/conf_imc/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Input Methods
 Name[de]=
+Name[eo]=Agordo - Tajpo-metodoj
 Name[es]=Configuración - Método de entrada
 Name[fr]=
+Name[hu]=Beállítások - Beviteli mód
 Name[it]=Configurazione - Metodo di input
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_imc
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select an input method.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti tajpo-metodon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir el método de entrada.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beviteli mód beállítások (input method).
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare un metodo di input.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in
index 70ee429..b34af88 100644
--- a/src/modules/conf_imc/module.desktop.in
+++ b/src/modules/conf_imc/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Input Methods
 Name[de]=
+Name[eo]=Agordo - Tajpo-metodoj
 Name[es]=Configuración - Método de entrada
 Name[fr]=
+Name[hu]=Beállítások - Beviteli mód
 Name[it]=Configurazione - Metodo di input
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_imc
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select an input method.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti tajpo-metodon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir el método de entrada.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Beviteli mód beállítások (input method).
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare un metodo di input.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_interaction/Makefile.in b/src/modules/conf_interaction/Makefile.in
index 05dd6bf..3a61284 100644
--- a/src/modules/conf_interaction/Makefile.in
+++ b/src/modules/conf_interaction/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index e6d045c..8c773f0 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -78,8 +78,7 @@ static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *ob;
-   E_Radio_Group *rg;
-   
+ 
    o = e_widget_list_add(evas, 0, 0);
 
    ob = e_widget_check_add(evas, _("Enable Thumbscroll"), &(cfdata->thumbscroll_enable));
diff --git a/src/modules/conf_interaction/module.desktop b/src/modules/conf_interaction/module.desktop
index 8a99175..a9a054d 100644
--- a/src/modules/conf_interaction/module.desktop
+++ b/src/modules/conf_interaction/module.desktop
@@ -4,7 +4,8 @@ Name=Configuration - Interaction
 Name[de]=
 Name[es]=
 Name[fr]=
-Name[it]=
+Name[hu]=Beállítások - Kölcsönhatások
+Name[it]=Configurazione - Interazione
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -15,7 +16,8 @@ Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure default use
 Comment[de]=
 Comment[es]=
 Comment[fr]=
-Comment[it]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett felhasználói kölcsönhatás beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le impostazioni predefinite per l'interazione utente.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in
index 8a99175..a9a054d 100644
--- a/src/modules/conf_interaction/module.desktop.in
+++ b/src/modules/conf_interaction/module.desktop.in
@@ -4,7 +4,8 @@ Name=Configuration - Interaction
 Name[de]=
 Name[es]=
 Name[fr]=
-Name[it]=
+Name[hu]=Beállítások - Kölcsönhatások
+Name[it]=Configurazione - Interazione
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -15,7 +16,8 @@ Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure default use
 Comment[de]=
 Comment[es]=
 Comment[fr]=
-Comment[it]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett felhasználói kölcsönhatás beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le impostazioni predefinite per l'interazione utente.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_intl/Makefile.in b/src/modules/conf_intl/Makefile.in
index c47d458..03e4a43 100644
--- a/src/modules/conf_intl/Makefile.in
+++ b/src/modules/conf_intl/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index 4f38886..1384048 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -28,10 +28,10 @@ static int  _basic_lang_list_sort           (void *data1, void *data2);
 /* Fill the clear lists, fill with language, select */
 /* Update lanague */
 static void      _cfdata_language_go        (const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata);
-static Evas_Bool _lang_hash_cb              (Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool _region_hash_cb            (Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool _language_hash_free_cb     (Evas_Hash *hash, const char *key, void *data, void *fdata);
-static Evas_Bool _region_hash_free_cb       (Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _lang_hash_cb              (const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
+static Evas_Bool _region_hash_cb            (const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
+static Evas_Bool _language_hash_free_cb     (const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__);
+static Evas_Bool _region_hash_free_cb       (const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__);
 static void      _intl_current_locale_setup (E_Config_Dialog_Data *cfdata);
 static const char *_intl_charset_upper_get  (const char *charset);
 
@@ -809,7 +809,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 }
 
 static Evas_Bool 
-_language_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_language_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    E_Intl_Language_Node *node;
 
@@ -823,7 +823,7 @@ _language_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata
 }
 
 static Evas_Bool 
-_region_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_region_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 { 
    E_Intl_Region_Node *node;
 
@@ -835,7 +835,8 @@ _region_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
 
 	str = node->available_codesets->data;
 	if (str) evas_stringshare_del(str);
-	node->available_codesets = evas_list_remove_list(node->available_codesets, node->available_codesets);
+	node->available_codesets = 
+          evas_list_remove_list(node->available_codesets, node->available_codesets);
      }
     
    while (node->available_modifiers) 
@@ -844,7 +845,8 @@ _region_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
 
 	str = node->available_modifiers->data;
 	if (str) evas_stringshare_del(str);
-	node->available_modifiers = evas_list_remove_list(node->available_modifiers, node->available_modifiers);
+	node->available_modifiers = 
+          evas_list_remove_list(node->available_modifiers, node->available_modifiers);
      }
    
    free(node);  
@@ -978,9 +980,9 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    
    if (cfdata->lang_list) 
      {
-	cfdata->lang_list = evas_list_sort(cfdata->lang_list, 
-					   evas_list_count(cfdata->lang_list), 
-					   _lang_list_sort);
+	cfdata->lang_list = 
+          evas_list_sort(cfdata->lang_list, evas_list_count(cfdata->lang_list), 
+                         _lang_list_sort);
 	_lang_list_load(cfdata);
      }
    
@@ -1170,12 +1172,13 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
 	     if (lang_update)
 	       {
 		  e_widget_ilist_clear(cfdata->gui.reg_list);
-		   
 		  cfdata->region_list = evas_list_free(cfdata->region_list);
-		  evas_hash_foreach(lang_node->region_hash, _region_hash_cb, cfdata);
-		  cfdata->region_list = evas_list_sort(cfdata->region_list, 
-						     evas_list_count(cfdata->region_list), 
-						     _region_list_sort);
+		  evas_hash_foreach(lang_node->region_hash, 
+                                    _region_hash_cb, cfdata);
+		  cfdata->region_list = 
+                    evas_list_sort(cfdata->region_list, 
+                                   evas_list_count(cfdata->region_list), 
+                                   _region_list_sort);
 		  _region_list_load(cfdata);
 	       }
 	     
@@ -1234,7 +1237,7 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
 }
 
 static Evas_Bool
-_lang_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_lang_hash_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
 {
    E_Config_Dialog_Data *cfdata; 
    E_Intl_Language_Node *lang_node;
@@ -1247,7 +1250,7 @@ _lang_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
 }
 
 static Evas_Bool
-_region_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_region_hash_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
 {
    E_Config_Dialog_Data *cfdata; 
    E_Intl_Region_Node *reg_node;
diff --git a/src/modules/conf_intl/module.desktop b/src/modules/conf_intl/module.desktop
index 651a94d..03ef516 100644
--- a/src/modules/conf_intl/module.desktop
+++ b/src/modules/conf_intl/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Language
 Name[de]=
+Name[eo]=Agordo - Lingvo
 Name[es]=Configuración - Idioma
 Name[fr]=
+Name[hu]=Beállítások - Nyelv
 Name[it]=Configurazione - Lingua
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_intl
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select a default language.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti propran lingvon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir el idioma predeterminado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett nyelv kiválasztása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare una lingua predefinita.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
index 651a94d..03ef516 100644
--- a/src/modules/conf_intl/module.desktop.in
+++ b/src/modules/conf_intl/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Language
 Name[de]=
+Name[eo]=Agordo - Lingvo
 Name[es]=Configuración - Idioma
 Name[fr]=
+Name[hu]=Beállítások - Nyelv
 Name[it]=Configurazione - Lingua
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_intl
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to select a default language.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti propran lingvon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir el idioma predeterminado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Alapértelmezett nyelv kiválasztása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare una lingua predefinita.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_keybindings/Makefile.in b/src/modules/conf_keybindings/Makefile.in
index 1383326..e0eff23 100644
--- a/src/modules/conf_keybindings/Makefile.in
+++ b/src/modules/conf_keybindings/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_keybindings/module.desktop b/src/modules/conf_keybindings/module.desktop
index 8b383dc..91ac426 100644
--- a/src/modules/conf_keybindings/module.desktop
+++ b/src/modules/conf_keybindings/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Key Bindings
 Name[de]=
+Name[eo]=Agordo - Klavaraj bindoj
 Name[es]=Configuración - Atajos de teclado
 Name[fr]=
+Name[hu]=Billentyű kombinációk
 Name[it]=Configurazione - Associazioni di tasti
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_keybindings
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure your keybindings here.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn klavarajn bindojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure sus atajos de teclado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkamazás</hilight><br><br>Billentyű kombinációk, gyorsbillentyűk beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le vostre associazioni di tasti.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index 8b383dc..91ac426 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Key Bindings
 Name[de]=
+Name[eo]=Agordo - Klavaraj bindoj
 Name[es]=Configuración - Atajos de teclado
 Name[fr]=
+Name[hu]=Billentyű kombinációk
 Name[it]=Configurazione - Associazioni di tasti
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_keybindings
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure your keybindings here.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn klavarajn bindojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure sus atajos de teclado.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkamazás</hilight><br><br>Billentyű kombinációk, gyorsbillentyűk beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le vostre associazioni di tasti.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_menus/Makefile.in b/src/modules/conf_menus/Makefile.in
index 3837913..1857705 100644
--- a/src/modules/conf_menus/Makefile.in
+++ b/src/modules/conf_menus/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_menus/module.desktop b/src/modules/conf_menus/module.desktop
index 22d356c..c4ea444 100644
--- a/src/modules/conf_menus/module.desktop
+++ b/src/modules/conf_menus/module.desktop
@@ -2,9 +2,11 @@
 Type=Link
 Name=Configuration - Menu Settings
 Name[de]=
-Name[es]=Configuración - Opciones de menú
+Name[eo]=Agordo - Menuaj agordoj
+Name[es]=Configuración - Opciones de menú
 Name[fr]=
-Name[it]=Configurazione - Impostazioni menù
+Name[hu]=Beállítások - Menü beállítások
+Name[it]=Configurazione - Impostazioni menù
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -13,12 +15,15 @@ Name[zh_TW]=
 Icon=e-module-conf_menus
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures menu behavior.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del menú.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la konduton de la menuo.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del menú.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento dei menù.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A menü beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento dei menù.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=config
+
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
index 22d356c..c4ea444 100644
--- a/src/modules/conf_menus/module.desktop.in
+++ b/src/modules/conf_menus/module.desktop.in
@@ -2,9 +2,11 @@
 Type=Link
 Name=Configuration - Menu Settings
 Name[de]=
-Name[es]=Configuración - Opciones de menú
+Name[eo]=Agordo - Menuaj agordoj
+Name[es]=Configuración - Opciones de menú
 Name[fr]=
-Name[it]=Configurazione - Impostazioni menù
+Name[hu]=Beállítások - Menü beállítások
+Name[it]=Configurazione - Impostazioni menù
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -13,12 +15,15 @@ Name[zh_TW]=
 Icon=e-module-conf_menus
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures menu behavior.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del menú.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la konduton de la menuo.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del menú.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento dei menù.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>A menü beállítása.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento dei menù.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=config
+
diff --git a/src/modules/conf_mime/Makefile.in b/src/modules/conf_mime/Makefile.in
index 8e9259d..892dacc 100644
--- a/src/modules/conf_mime/Makefile.in
+++ b/src/modules/conf_mime/Makefile.in
@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -105,6 +107,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -124,6 +127,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -149,6 +154,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_mime/module.desktop b/src/modules/conf_mime/module.desktop
index c3c9abe..1462924 100644
--- a/src/modules/conf_mime/module.desktop
+++ b/src/modules/conf_mime/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - File Icons
 Name[de]=
+Name[eo]=Agordo - Dosieraj piktogramoj
 Name[es]=Configuración - Íconos de archivo
 Name[fr]=
+Name[hu]=Beállítások - Fájl ikonok
 Name[it]=Configurazione - Icone dei file
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mime
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure E17 mime icons.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi piktogramojn de E17 por MIME.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure los íconos mime de E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Fájltípusok ikonjainak a beállítása az E17 fájlkezelőjében.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le icone dei tipi MIME in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
index c3c9abe..1462924 100644
--- a/src/modules/conf_mime/module.desktop.in
+++ b/src/modules/conf_mime/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - File Icons
 Name[de]=
+Name[eo]=Agordo - Dosieraj piktogramoj
 Name[es]=Configuración - Íconos de archivo
 Name[fr]=
+Name[hu]=Beállítások - Fájl ikonok
 Name[it]=Configurazione - Icone dei file
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mime
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure E17 mime icons.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi piktogramojn de E17 por MIME.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure los íconos mime de E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Fájltípusok ikonjainak a beállítása az E17 fájlkezelőjében.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le icone dei tipi MIME in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mouse/Makefile.in b/src/modules/conf_mouse/Makefile.in
index c513399..a2eec51 100644
--- a/src/modules/conf_mouse/Makefile.in
+++ b/src/modules/conf_mouse/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_mouse/module.desktop b/src/modules/conf_mouse/module.desktop
index 0e570e0..5eee9f4 100644
--- a/src/modules/conf_mouse/module.desktop
+++ b/src/modules/conf_mouse/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Acceleration
 Name[de]=
+Name[eo]=Agordo - Musa plirapidigo
 Name[es]=Configuración - Aceleración del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér sebessége
 Name[it]=Configurazione - Accelerazione mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mouse
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure mouse cursor acceleration.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la musan plirapidigon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure la aceleración del cursor del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Egér kurzor sebességének beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura l'accelerazione del puntatore del mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
index 0e570e0..5eee9f4 100644
--- a/src/modules/conf_mouse/module.desktop.in
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Acceleration
 Name[de]=
+Name[eo]=Agordo - Musa plirapidigo
 Name[es]=Configuración - Aceleración del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér sebessége
 Name[it]=Configurazione - Accelerazione mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mouse
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure mouse cursor acceleration.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la musan plirapidigon.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configure la aceleración del cursor del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Egér kurzor sebességének beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura l'accelerazione del puntatore del mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mouse_cursor/Makefile.in b/src/modules/conf_mouse_cursor/Makefile.in
index 685add6..bf96972 100644
--- a/src/modules/conf_mouse_cursor/Makefile.in
+++ b/src/modules/conf_mouse_cursor/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_mouse_cursor/module.desktop b/src/modules/conf_mouse_cursor/module.desktop
index 47e526e..ca0aa2a 100644
--- a/src/modules/conf_mouse_cursor/module.desktop
+++ b/src/modules/conf_mouse_cursor/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Cursor
 Name[de]=
+Name[eo]=Agordo - Musa kursoro
 Name[es]=Configuración - Cursor del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér mutató
 Name[it]=Configurazione - Cursore del mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mouse_cursor
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Select the mouse cursor style.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti la stilon de la musa kursoro.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Seleccione el diseño del cursor del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az egér kurzor stílusának a beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Seleziona lo stile di puntatore per il mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
index 47e526e..ca0aa2a 100644
--- a/src/modules/conf_mouse_cursor/module.desktop.in
+++ b/src/modules/conf_mouse_cursor/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Cursor
 Name[de]=
+Name[eo]=Agordo - Musa kursoro
 Name[es]=Configuración - Cursor del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér mutató
 Name[it]=Configurazione - Cursore del mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mouse_cursor
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Select the mouse cursor style.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti la stilon de la musa kursoro.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Seleccione el diseño del cursor del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az egér kurzor stílusának a beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Seleziona lo stile di puntatore per il mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mousebindings/Makefile.in b/src/modules/conf_mousebindings/Makefile.in
index 4b240bc..a571351 100644
--- a/src/modules/conf_mousebindings/Makefile.in
+++ b/src/modules/conf_mousebindings/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index 0416def..3c5c3f5 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -1299,7 +1299,8 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata)
    e_win_centered_set(cfdata->locals.dia->win, 1);
    e_win_borderless_set(cfdata->locals.dia->win, 1);
 
-   cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
+   cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0,
+						      man->w, man->h);
    ecore_x_window_show(cfdata->locals.bind_win);
    e_grabinput_get(cfdata->locals.bind_win, 0, cfdata->locals.bind_win);
 
diff --git a/src/modules/conf_mousebindings/module.desktop b/src/modules/conf_mousebindings/module.desktop
index 15670d4..a673012 100644
--- a/src/modules/conf_mousebindings/module.desktop
+++ b/src/modules/conf_mousebindings/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Bindings
 Name[de]=
+Name[eo]=Agordo - Musaj bindoj
 Name[es]=Configuración - Atajos del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér kombinációk
 Name[it]=Configurazione - Associazioni del mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mousebindings
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your mouse bindings.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn musajn bindojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar los atajos del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az egér gombok kombinációjának beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le associazioni per i tasti del mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
index 15670d4..a673012 100644
--- a/src/modules/conf_mousebindings/module.desktop.in
+++ b/src/modules/conf_mousebindings/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Mouse Bindings
 Name[de]=
+Name[eo]=Agordo - Musaj bindoj
 Name[es]=Configuración - Atajos del mouse
 Name[fr]=
+Name[hu]=Beállítások - Egér kombinációk
 Name[it]=Configurazione - Associazioni del mouse
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_mousebindings
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your mouse bindings.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn musajn bindojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar los atajos del mouse.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az egér gombok kombinációjának beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le associazioni per i tasti del mouse.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_paths/Makefile.in b/src/modules/conf_paths/Makefile.in
index 2fec159..751f2ab 100644
--- a/src/modules/conf_paths/Makefile.in
+++ b/src/modules/conf_paths/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_paths/module.desktop b/src/modules/conf_paths/module.desktop
index a687181..ed5f507 100644
--- a/src/modules/conf_paths/module.desktop
+++ b/src/modules/conf_paths/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Search Directories
 Name[de]=
+Name[eo]=Agordo - Dosierujoj de serĉo
 Name[es]=Configuración - Directorios de búsqueda
 Name[fr]=
+Name[hu]=Beállítások - Könyvtárak
 Name[it]=Configurazione - Percorsi di ricerca
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_paths
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Specifies the E17 search paths and default directories.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Especifica las rutas de búsqueda de E17 y los directorios predefinidos. 
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Difini la vojojn de serĉo de E17 kaj defaŭltajn dosierujojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Especifica las rutas de búsqueda de E17 y los directorios predefinidos.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az E17 alapértelmezett rendszerkönyvtárainak a beállítása (képek, modulok, stb.).
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Specifica i percorsi di ricerca e le directory predefinite in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
index a687181..ed5f507 100644
--- a/src/modules/conf_paths/module.desktop.in
+++ b/src/modules/conf_paths/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Search Directories
 Name[de]=
+Name[eo]=Agordo - Dosierujoj de serĉo
 Name[es]=Configuración - Directorios de búsqueda
 Name[fr]=
+Name[hu]=Beállítások - Könyvtárak
 Name[it]=Configurazione - Percorsi di ricerca
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_paths
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Specifies the E17 search paths and default directories.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Especifica las rutas de búsqueda de E17 y los directorios predefinidos. 
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Difini la vojojn de serĉo de E17 kaj defaŭltajn dosierujojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Especifica las rutas de búsqueda de E17 y los directorios predefinidos.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az E17 alapértelmezett rendszerkönyvtárainak a beállítása (képek, modulok, stb.).
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Specifica i percorsi di ricerca e le directory predefinite in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_performance/Makefile.in b/src/modules/conf_performance/Makefile.in
index 99871f3..a66e662 100644
--- a/src/modules/conf_performance/Makefile.in
+++ b/src/modules/conf_performance/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_performance/module.desktop b/src/modules/conf_performance/module.desktop
index 8159c3d..1e5ec90 100644
--- a/src/modules/conf_performance/module.desktop
+++ b/src/modules/conf_performance/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Performance
 Name[de]=
-Name[es]=Configuración - Rendimiento
+Name[eo]=Agordo - Rendimento
+Name[es]=Configuración - Rendimiento
 Name[fr]=
+Name[hu]=Beállítások - Teljesítmény
 Name[it]=Configurazione - Prestazioni
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_performance
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure certain performance related items as frame rates and cache settings.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar ciertos elementos de rendimiento como opciones de caché y cuadros por segundo.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi kelkajn erojn pri rendimento kiel kadrajn oftecojn kaj kaŝmemorajn agordojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar ciertos elementos de rendimiento como opciones de caché y cuadros por segundo.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare alcune proprieta' correlate alle prestazioni come velocità frame e cache.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az E17 teljesítményének beállítása (fps, átmeneti tárolók mérete, ürítési idõközök).
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare alcune proprietà correlate alle prestazioni come velocità frame e cache.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
index 8159c3d..1e5ec90 100644
--- a/src/modules/conf_performance/module.desktop.in
+++ b/src/modules/conf_performance/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Performance
 Name[de]=
-Name[es]=Configuración - Rendimiento
+Name[eo]=Agordo - Rendimento
+Name[es]=Configuración - Rendimiento
 Name[fr]=
+Name[hu]=Beállítások - Teljesítmény
 Name[it]=Configurazione - Prestazioni
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_performance
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure certain performance related items as frame rates and cache settings.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar ciertos elementos de rendimiento como opciones de caché y cuadros por segundo.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi kelkajn erojn pri rendimento kiel kadrajn oftecojn kaj kaŝmemorajn agordojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar ciertos elementos de rendimiento como opciones de caché y cuadros por segundo.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare alcune proprieta' correlate alle prestazioni come velocità frame e cache.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az E17 teljesítményének beállítása (fps, átmeneti tárolók mérete, ürítési idõközök).
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare alcune proprietà correlate alle prestazioni come velocità frame e cache.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_profiles/Makefile.in b/src/modules/conf_profiles/Makefile.in
index 3a6d89d..3e51ccd 100644
--- a/src/modules/conf_profiles/Makefile.in
+++ b/src/modules/conf_profiles/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index b054ed8..216a114 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -109,7 +109,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 {
    Evas *evas;
    Evas_List *l;
-   char *cur_profile;
+   const char *cur_profile;
    
    if (!cfdata) return;
    if (!cfdata->o_list) return;
@@ -122,7 +122,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
    e_widget_ilist_clear(cfdata->o_list);
    e_widget_ilist_go(cfdata->o_list);
    
-   cur_profile = e_config_profile_get ();
+   cur_profile = e_config_profile_get();
    for (l = e_config_profile_list(); l; l = l->next) 
      {
 	Evas_Object *ob;
@@ -148,12 +148,12 @@ static void
 _ilist_cb_selected(void *data) 
 {
    E_Config_Dialog_Data *cfdata;
-   char *cur_profile;
+   const char *cur_profile;
    
    cfdata = data;
    if (!cfdata) return;
    
-   cur_profile = e_config_profile_get ();
+   cur_profile = e_config_profile_get();
    if (!strcmp (cur_profile, cfdata->sel_profile))
      {
    e_widget_disabled_set(cfdata->o_select, 1);
@@ -175,7 +175,7 @@ _cb_add(void *data, void *data2)
    if (!cfdata) return;
 
    if (cfdata->dia_new_profile)
-     e_win_raise (cfdata->dia_new_profile->win);
+     e_win_raise(cfdata->dia_new_profile->win);
    else 
      cfdata->dia_new_profile = _dia_new_profile(cfdata);
 }
@@ -189,10 +189,10 @@ _cb_select(void *data, void *data2)
    cfdata = data;
    if (!cfdata) return;
 
-   e_config_save_flush ();
-   e_config_profile_set (cfdata->sel_profile);
-   e_config_profile_save ();
-   e_config_save_block_set (1);
+   e_config_save_flush();
+   e_config_profile_set(cfdata->sel_profile);
+   e_config_profile_save();
+   e_config_save_block_set(1);
 
    a = e_action_find("restart");
    if ((a) && (a->func.go)) a->func.go(NULL, NULL);
@@ -225,7 +225,7 @@ _cb_dialog_yes(void *data)
    d = data;
    if (!data) return;
 
-   e_config_profile_del (d->cfdata->sel_profile);
+   e_config_profile_del(d->cfdata->sel_profile);
    e_config_save_queue();
    _ilist_fill(d->cfdata);
 }
@@ -316,17 +316,17 @@ _new_profile_cb_ok(void *data, E_Dialog *dia)
    cfdata = data;
    if (!cfdata) return;
    
-   snprintf (cur_profile, sizeof (cur_profile), "%s", e_config_profile_get ());
+   snprintf(cur_profile, sizeof (cur_profile), "%s", e_config_profile_get());
 
    if (cfdata->new_profile)
      {
-   e_config_profile_add(cfdata->new_profile);
-   if (cfdata->new_profile_type)
-     {
-   e_config_profile_set (cfdata->new_profile);
-   e_config_save();
-   e_config_profile_set (cur_profile);
-     }
+	e_config_profile_add(cfdata->new_profile);
+	if (cfdata->new_profile_type)
+	  {
+	     e_config_profile_set(cfdata->new_profile);
+	     e_config_save();
+	     e_config_profile_set(cur_profile);
+	  }
      }
 
    e_object_unref(E_OBJECT(dia));
diff --git a/src/modules/conf_profiles/module.desktop b/src/modules/conf_profiles/module.desktop
index baa39ea..a297683 100644
--- a/src/modules/conf_profiles/module.desktop
+++ b/src/modules/conf_profiles/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Profiles
 Name[de]=
+Name[eo]=Agordo - Profiloj
 Name[es]=Configuración - Perfiles
 Name[fr]=
+Name[hu]=Beállítások - Profilok
 Name[it]=Configurazione - Profili
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_profiles
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows management of configuration profiles.
 Comment[de]=
-Comment[es]=<hilight>Applet de copnfiguración de E17</hilight><br><br>Permite la administración de perfiles de configuración.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Administri agordajn profilojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la administración de perfiles de configuración.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Lehetőséged van különböző profilok beállítására.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la gestione dei profili di configurazione.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_profiles/module.desktop.in b/src/modules/conf_profiles/module.desktop.in
index baa39ea..a297683 100644
--- a/src/modules/conf_profiles/module.desktop.in
+++ b/src/modules/conf_profiles/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Profiles
 Name[de]=
+Name[eo]=Agordo - Profiloj
 Name[es]=Configuración - Perfiles
 Name[fr]=
+Name[hu]=Beállítások - Profilok
 Name[it]=Configurazione - Profili
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_profiles
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Allows management of configuration profiles.
 Comment[de]=
-Comment[es]=<hilight>Applet de copnfiguración de E17</hilight><br><br>Permite la administración de perfiles de configuración.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Administri agordajn profilojn.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Permite la administración de perfiles de configuración.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Lehetőséged van különböző profilok beállítására.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Consente la gestione dei profili di configurazione.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_screensaver/Makefile.in b/src/modules/conf_screensaver/Makefile.in
index 6353f08..41da24c 100644
--- a/src/modules/conf_screensaver/Makefile.in
+++ b/src/modules/conf_screensaver/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_screensaver/module.desktop b/src/modules/conf_screensaver/module.desktop
index 91ed1ce..4405c5b 100644
--- a/src/modules/conf_screensaver/module.desktop
+++ b/src/modules/conf_screensaver/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Saver
 Name[de]=
+Name[eo]=Agordo - Ekrankurtenoj
 Name[es]=Configuración - Salvapantallas
 Name[fr]=
+Name[hu]=Beállítások - Képernyővédő
 Name[it]=Configurazione - Screensaver
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_screensaver
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures the X screensaver.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la ekrankurtenon de X.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el salvapantallas de X.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az X képernyővédő beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura lo screensaver di X.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
index 91ed1ce..4405c5b 100644
--- a/src/modules/conf_screensaver/module.desktop.in
+++ b/src/modules/conf_screensaver/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Screen Saver
 Name[de]=
+Name[eo]=Agordo - Ekrankurtenoj
 Name[es]=Configuración - Salvapantallas
 Name[fr]=
+Name[hu]=Beállítások - Képernyővédő
 Name[it]=Configurazione - Screensaver
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_screensaver
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures the X screensaver.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la ekrankurtenon de X.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el salvapantallas de X.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az X képernyővédő beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura lo screensaver di X.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_shelves/Makefile.in b/src/modules/conf_shelves/Makefile.in
index 169cf08..080d42e 100644
--- a/src/modules/conf_shelves/Makefile.in
+++ b/src/modules/conf_shelves/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_shelves/module.desktop b/src/modules/conf_shelves/module.desktop
index 93d89d3..a115ed5 100644
--- a/src/modules/conf_shelves/module.desktop
+++ b/src/modules/conf_shelves/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Shelves
 Name[de]=
+Name[eo]=Agordo - Bretoj
 Name[es]=Configuración - Contenedores
 Name[fr]=
+Name[hu]=Beállítások - Polcok
 Name[it]=Configurazione - Mensole
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_shelves
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Shelf configuration dialog.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Dialogo de agordo de bretoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Diálogo de configuración del contenedor.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ezzel a modullal a polcok beállításait tudod elvégezni.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Interfaccia per la configurazione delle mensole portamoduli.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
index 93d89d3..a115ed5 100644
--- a/src/modules/conf_shelves/module.desktop.in
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Shelves
 Name[de]=
+Name[eo]=Agordo - Bretoj
 Name[es]=Configuración - Contenedores
 Name[fr]=
+Name[hu]=Beállítások - Polcok
 Name[it]=Configurazione - Mensole
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_shelves
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Shelf configuration dialog.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Dialogo de agordo de bretoj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Diálogo de configuración del contenedor.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ezzel a modullal a polcok beállításait tudod elvégezni.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Interfaccia per la configurazione delle mensole portamoduli.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_startup/Makefile.in b/src/modules/conf_startup/Makefile.in
index 0ffade2..5972fb5 100644
--- a/src/modules/conf_startup/Makefile.in
+++ b/src/modules/conf_startup/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_startup/module.desktop b/src/modules/conf_startup/module.desktop
index 9bf8683..c3ec016 100644
--- a/src/modules/conf_startup/module.desktop
+++ b/src/modules/conf_startup/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Startup
 Name[de]=
+Name[eo]=Agordo - Startigo
 Name[es]=Configuración - Inicio
 Name[fr]=
+Name[hu]=Beállítások - Rendszerindítás
 Name[it]=Configurazione - Avvio
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_startup
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the E17 splash screen.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la salutŝildon de E17.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar la pantalla de inicio de E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Lehetőséged van beállítani az E17 indító képernyőjét.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare lo splash screen di E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
index 9bf8683..c3ec016 100644
--- a/src/modules/conf_startup/module.desktop.in
+++ b/src/modules/conf_startup/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Startup
 Name[de]=
+Name[eo]=Agordo - Startigo
 Name[es]=Configuración - Inicio
 Name[fr]=
+Name[hu]=Beállítások - Rendszerindítás
 Name[it]=Configurazione - Avvio
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_startup
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure the E17 splash screen.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la salutŝildon de E17.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar la pantalla de inicio de E17.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Lehetőséged van beállítani az E17 indító képernyőjét.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare lo splash screen di E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_theme/Makefile.in b/src/modules/conf_theme/Makefile.in
index 3294cc1..db5890f 100644
--- a/src/modules/conf_theme/Makefile.in
+++ b/src/modules/conf_theme/Makefile.in
@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -105,6 +107,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -124,6 +127,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -149,6 +154,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 1c5bb61..c7d63a0 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -20,7 +20,6 @@ struct _E_Config_Dialog_Data
    E_Config_Dialog *cfd;
 
    /* Basic */
-   Evas_Object *o_frame;
    Evas_Object *o_fm;
    Evas_Object *o_up_button;
    Evas_Object *o_preview;
@@ -76,38 +75,23 @@ EAPI void
 e_int_config_theme_update(E_Config_Dialog *dia, char *file)
 {
    E_Config_Dialog_Data *cfdata;
-   const char *homedir;
    char path[4096];
 
    cfdata = dia->cfdata;
 
-   homedir = e_user_homedir_get();
    cfdata->fmdir = 1;
    e_widget_radio_toggle_set(cfdata->o_personal, 1);
 
-   snprintf(path, sizeof(path), "%s/.e/e/themes", homedir);
+   snprintf(path, sizeof(path), "%s/.e/e/themes", e_user_homedir_get());
    E_FREE(cfdata->theme);
    cfdata->theme = strdup(file);
 
    if (cfdata->o_fm)
-     e_fm2_path_set(cfdata->o_fm, path, "/");
+     e_widget_flist_path_set(cfdata->o_fm, path, "/");
 
    if (cfdata->o_preview)
      e_widget_preview_edje_set(cfdata->o_preview, cfdata->theme, "e/desktop/background");
-   if (cfdata->o_frame)
-     e_widget_change(cfdata->o_frame);
-
-/*
-
-   if (cfdata->o_fm)
-     {
-	e_fm2_select_set(cfdata->o_fm, file, 1);
-	e_fm2_file_show(cfdata->o_fm, file);
-
-	evas_object_smart_callback_call(cfdata->o_fm,
-					"selection_change", cfdata);
-     }
- */
+   if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
 static void
@@ -116,10 +100,7 @@ _cb_button_up(void *data1, void *data2)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = data1;
-   if (cfdata->o_fm)
-     e_fm2_parent_go(cfdata->o_fm);
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+   if (cfdata->o_fm) e_widget_flist_parent_go(cfdata->o_fm);
 }
 
 static void
@@ -129,18 +110,9 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
 
    cfdata = data;
    if (!cfdata->o_fm) return;
-   if (!e_fm2_has_parent_get(cfdata->o_fm))
-     {
-	if (cfdata->o_up_button)
-	  e_widget_disabled_set(cfdata->o_up_button, 1);
-     }
-   else
-     {
-	if (cfdata->o_up_button)
-	  e_widget_disabled_set(cfdata->o_up_button, 0);
-     }
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+   if (cfdata->o_up_button)
+     e_widget_disabled_set(cfdata->o_up_button, 
+                           !e_widget_flist_has_parent_get(cfdata->o_fm));
 }
 
 static void
@@ -155,11 +127,10 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
    cfdata = data;
    if (!cfdata->o_fm) return;
 
-   selected = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!selected) return;
+   if (!(selected = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
 
    ici = selected->data;
-   realpath = e_fm2_real_path_get(cfdata->o_fm);
+   realpath = e_widget_flist_real_path_get(cfdata->o_fm);
 
    if (!strcmp(realpath, "/"))
      snprintf(buf, sizeof(buf), "/%s", ici->file);
@@ -173,8 +144,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
    cfdata->theme = strdup(buf);
    if (cfdata->o_preview)
      e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background");
-   if (cfdata->o_frame)
-     e_widget_change(cfdata->o_frame);
+   if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
 static void
@@ -190,20 +160,19 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    const char *p;
-   const char *homedir;
    char buf[4096];
 
    cfdata = data;
-   if (!cfdata->theme) return;
-   if (!cfdata->o_fm) return;
-   p = e_fm2_real_path_get(cfdata->o_fm);
+   if ((!cfdata->theme) || (!cfdata->o_fm)) return;
+
+   p = e_widget_flist_real_path_get(cfdata->o_fm);
    if (p)
      {
 	if (strncmp(p, cfdata->theme, strlen(p))) return;
      }
-   homedir = e_user_homedir_get();
-   snprintf(buf, sizeof(buf), "%s/.e/e/themes", homedir);
    if (!p) return;
+
+   snprintf(buf, sizeof(buf), "%s/.e/e/themes", e_user_homedir_get());
    if (!strncmp(cfdata->theme, buf, strlen(buf)))
      p = cfdata->theme + strlen(buf) + 1;
    else
@@ -214,8 +183,8 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 	else
 	  p = cfdata->theme;
      }
-   e_fm2_select_set(cfdata->o_fm, p, 1);
-   e_fm2_file_show(cfdata->o_fm, p);
+   e_widget_flist_select_set(cfdata->o_fm, p, 1);
+   e_widget_flist_file_show(cfdata->o_fm, p);
 }
 
 static void
@@ -223,19 +192,13 @@ _cb_dir(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    char path[4096];
-   const char *homedir;
 
    cfdata = data;
    if (cfdata->fmdir == 1)
-     {
-	snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get());
-     }
+     snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get());
    else
-     {
-	homedir = e_user_homedir_get();
-	snprintf(path, sizeof(path), "%s/.e/e/themes", homedir);
-     }
-   e_fm2_path_set(cfdata->o_fm, path, "/");
+     snprintf(path, sizeof(path), "%s/.e/e/themes", e_user_homedir_get());
+   e_widget_flist_path_set(cfdata->o_fm, path, "/");
 }
 
 static void
@@ -246,13 +209,10 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
    E_Fm2_Icon_Info *ici, *ic;
 
    cfdata = data;
-   if (!cfdata->theme) return;
-   if (!cfdata->o_fm) return;
+   if ((!cfdata->theme) || (!cfdata->o_fm)) return;
 
-   all = e_fm2_all_list_get(cfdata->o_fm);
-   if (!all) return;
-   sel = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!sel) return;
+   if (!(all = e_widget_flist_all_list_get(cfdata->o_fm))) return;
+   if (!(sel = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
 
    ici = sel->data;
 
@@ -264,11 +224,10 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
 	if (!n) return;
      }
 
-   ic = n->data;
-   if (!ic) return;
+   if (!(ic = n->data)) return;
 
-   e_fm2_select_set(cfdata->o_fm, ic->file, 1);
-   e_fm2_file_show(cfdata->o_fm, ic->file);
+   e_widget_flist_select_set(cfdata->o_fm, ic->file, 1);
+   e_widget_flist_file_show(cfdata->o_fm, ic->file);
 
    evas_list_free(n);
 
@@ -292,20 +251,20 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 {
    E_Config_Theme * c;
    char path[4096];
-   const char *homedir;
 
    c = e_theme_config_get("theme");
    if (c)
      cfdata->theme = strdup(c->file);
    else
      {
-	snprintf(path, sizeof(path), "%s/data/themes/default.edj", e_prefix_data_get());
+	snprintf(path, sizeof(path), "%s/data/themes/default.edj", 
+                 e_prefix_data_get());
 	cfdata->theme = strdup(path);
      }
    if (cfdata->theme[0] != '/')
      {
-        homedir = e_user_homedir_get();
-        snprintf(path, sizeof(path), "%s/.e/e/themes/%s", homedir, cfdata->theme);
+        snprintf(path, sizeof(path), "%s/.e/e/themes/%s", 
+                 e_user_homedir_get(), cfdata->theme);
 	if (ecore_file_exists(path))
 	  {
 	     E_FREE(cfdata->theme);
@@ -313,7 +272,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	  }
 	else
 	  {
-	     snprintf(path, sizeof(path), "%s/data/themes/%s", e_prefix_data_get(), cfdata->theme);
+	     snprintf(path, sizeof(path), "%s/data/themes/%s", 
+                      e_prefix_data_get(), cfdata->theme);
 	     if (ecore_file_exists(path))
 	       {
 		  E_FREE(cfdata->theme);
@@ -357,13 +317,9 @@ static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *ot, *of, *il, *ol;
-   char path[4096];
-   const char *homedir;
-   E_Fm2_Config fmc;
    E_Zone *z;
    E_Radio_Group *rg;
-
-   homedir = e_user_homedir_get();
+   char path[4096];
 
    z = e_zone_current_get(cfd->con);
 
@@ -391,51 +347,22 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    if (cfdata->fmdir == 1)
      snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get());
    else
-     snprintf(path, sizeof(path), "%s/.e/e/themes", homedir);
-
-   cfdata->o_fm = NULL;
-   o = e_fm2_add(evas);
-   memset(&fmc, 0, sizeof(E_Fm2_Config));
-   fmc.view.mode = E_FM2_VIEW_MODE_LIST;
-   fmc.view.open_dirs_in_place = 1;
-   fmc.view.selector = 1;
-   fmc.view.single_click = 0;
-   fmc.view.no_subdir_jump = 0;
-   fmc.icon.list.w = 48;
-   fmc.icon.list.h = 48;
-   fmc.icon.fixed.w = 1;
-   fmc.icon.fixed.h = 1;
-   fmc.icon.extension.show = 0;
-   fmc.icon.key_hint = NULL;
-   fmc.list.sort.no_case = 1;
-   fmc.list.sort.dirs.first = 0;
-   fmc.list.sort.dirs.last = 1;
-   fmc.selection.single = 1;
-   fmc.selection.windows_modifiers = 0;
-   e_fm2_config_set(o, &fmc);
-   e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
+     snprintf(path, sizeof(path), "%s/.e/e/themes", e_user_homedir_get());
+
+   o = e_widget_flist_add(evas);
+   cfdata->o_fm = o;
    evas_object_smart_callback_add(o, "dir_changed",
 				  _cb_files_changed, cfdata);
    evas_object_smart_callback_add(o, "selection_change",
 				  _cb_files_selection_change, cfdata);
-   evas_object_smart_callback_add(o, "selected",
-				  _cb_files_selected, cfdata);
    evas_object_smart_callback_add(o, "changed",
 				  _cb_files_files_changed, cfdata);
    evas_object_smart_callback_add(o, "files_deleted",
 				  _cb_files_files_deleted, cfdata);
+   e_widget_flist_path_set(o, path, "/");
 
-   e_fm2_path_set(o, path, "/");
-
-   of = e_widget_scrollframe_pan_add(evas, o,
-				     e_fm2_pan_set,
-				     e_fm2_pan_get,
-				     e_fm2_pan_max_get,
-				     e_fm2_pan_child_size_get);
-   cfdata->o_fm = o;
-   cfdata->o_frame = of;
-   e_widget_min_size_set(of, 160, 160);
-   e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_min_size_set(o, 160, 160);
+   e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1);
 
    of = e_widget_list_add(evas, 0, 0);
@@ -585,14 +512,13 @@ _get_theme_categories_list(void)
    for (g = e_theme_category_list(); g; g = g->next)
      {
 	const char *c;
-	c = g->data;
-	if (!c) continue;
+
+	if (!(c = g->data)) continue;
 
 	cats2 = cats;
 	while (cats2)
 	  {
-	     if (!strcmp(c, cats2->data))
-	       break;
+	     if (!strcmp(c, cats2->data)) break;
 	     cats2 = cats2->next;
 	  }
 	if (!cats2)
@@ -620,9 +546,7 @@ _get_theme_categories_list(void)
 	       {
 		  theme = themes->data;
 		  if (!strcmp(category + 5, theme->category))
-		    {
-		       newtheme->file = strdup(theme->file);
-		    }
+                    newtheme->file = strdup(theme->file);
 	       }
 	     tcl = evas_list_append(tcl, newtheme);
 	  }
@@ -639,16 +563,17 @@ _files_ilist_nth_label_to_file(void *data, int n)
    E_Config_Dialog_Data *cfdata;
    char file[1024];
 
-   cfdata = data;
-   if (!cfdata) return NULL;
+   if (!(cfdata = data)) return NULL;
    if (!cfdata->o_files_ilist) return NULL;
 
    if (n > cfdata->personal_file_count)
      snprintf(file, sizeof(file), "%s/data/themes/%s.edj",
-	   e_prefix_data_get(), e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n));
+              e_prefix_data_get(), 
+              e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n));
    else
      snprintf(file, sizeof(file), "%s/.e/e/themes/%s.edj",
-	   e_user_homedir_get(), e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n));
+              e_user_homedir_get(), 
+              e_widget_ilist_nth_label_get(cfdata->o_files_ilist, n));
 
    return strdup(file);
 }
@@ -662,20 +587,18 @@ _preview_set(void *data)
    int n, ret = 0;
    Evas_List *p;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
 
    n = e_widget_ilist_selected_get(cfdata->o_files_ilist);
    theme = _files_ilist_nth_label_to_file(cfdata, n);
    snprintf(c_label, sizeof(c_label), "%s:",
-	 e_widget_ilist_selected_label_get(cfdata->o_categories_ilist));
+            e_widget_ilist_selected_label_get(cfdata->o_categories_ilist));
    if (theme)
      {
 	p = cfdata->parts_list;
 	while (p)
 	  {
-	     if (strstr((char *)(p->data), c_label))
-	       break;
+	     if (strstr((char *)(p->data), c_label)) break;
 	     p = p->next;
 	  }
 	if (p)
@@ -698,8 +621,7 @@ _cb_adv_categories_change(void *data, Evas_Object *obj)
    Evas_Object *ic = NULL;
    int n;
 
-   cfdata = data;
-   if (!cfdata) return;
+   if (!(cfdata = data)) return;
 
    label = e_widget_ilist_selected_label_get(cfdata->o_categories_ilist);
    if (!label) return;
@@ -754,10 +676,7 @@ _theme_file_used(Evas_List *tlist, const char *filename)
    while (tlist)
      {
 	theme = tlist->data;
-	if (theme->file && !strcmp(theme->file, filename))
-	  {
-	     return 1;
-	  }
+	if (theme->file && !strcmp(theme->file, filename)) return 1;
 	tlist = tlist->next;
      }
 
@@ -803,6 +722,7 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *header, const char *d
 	while (themefiles)
 	  {
 	     Evas_Object *ic = NULL;
+
 	     if (_theme_file_used(cfdata->theme_list, themefiles->data))
 	       {
 		  ic = edje_object_add(evas);
@@ -828,8 +748,7 @@ _fill_files_ilist(E_Config_Dialog_Data *cfdata)
    Evas_Object *o;
    char theme_dir[4096];
 
-   o = cfdata->o_files_ilist;
-   if (!o) return;
+   if (!(o = cfdata->o_files_ilist)) return;
 
    evas = evas_object_evas_get(o);
    evas_event_freeze(evas);
@@ -839,13 +758,13 @@ _fill_files_ilist(E_Config_Dialog_Data *cfdata)
 
    /* Grab the "Personal" themes. */
    snprintf(theme_dir, sizeof(theme_dir), "%s/.e/e/themes",
-	 e_user_homedir_get());
+            e_user_homedir_get());
    cfdata->personal_file_count = 
      _ilist_files_add(cfdata, _("Personal"), theme_dir);
 
    /* Grab the "System" themes. */
    snprintf(theme_dir, sizeof(theme_dir),
-	 "%s/data/themes", e_prefix_data_get());
+            "%s/data/themes", e_prefix_data_get());
    _ilist_files_add(cfdata, _("System"), theme_dir);
 
    e_widget_ilist_go(o);
@@ -862,8 +781,7 @@ _fill_categories_ilist(E_Config_Dialog_Data *cfdata)
    E_Config_Theme *theme;
    Evas_Object *o;
 
-   o = cfdata->o_categories_ilist;
-   if (!o) return;
+   if (!(o = cfdata->o_categories_ilist)) return;
 
    evas = evas_object_evas_get(o);
    evas_event_freeze(evas);
@@ -904,13 +822,10 @@ _cb_adv_btn_assign(void *data1, void *data2)
    const char *label;
    int n;
 
-   cfdata = data1;
-   if (!cfdata) return;
+   if (!(cfdata = data1)) return;
 
-   oc = cfdata->o_categories_ilist;
-   if (!oc) return;
-   of = cfdata->o_files_ilist;
-   if (!of) return;
+   if (!(oc = cfdata->o_categories_ilist)) return;
+   if (!(of = cfdata->o_files_ilist)) return;
 
    evas = evas_object_evas_get(oc);
    n = e_widget_ilist_selected_get(oc);
@@ -975,13 +890,10 @@ _cb_adv_btn_clear(void *data1, void *data2)
    const char *filename = NULL;
    int n;
 
-   cfdata = data1;
-   if (!cfdata) return;
+   if (!(cfdata = data1)) return;
 
-   oc = cfdata->o_categories_ilist;
-   if (!oc) return;
-   of = cfdata->o_files_ilist;
-   if (!of) return;
+   if (!(oc = cfdata->o_categories_ilist)) return;
+   if (!(of = cfdata->o_files_ilist)) return;
 
    n = e_widget_ilist_selected_get(oc);
    e_widget_ilist_nth_icon_set(oc, n, NULL);
@@ -1024,13 +936,10 @@ _cb_adv_btn_clearall(void *data1, void *data2)
    Evas_Object *oc = NULL, *of = NULL;
    int n;
 
-   cfdata = data1;
-   if (!cfdata) return;
+   if (!(cfdata = data1)) return;
 
-   oc = cfdata->o_categories_ilist;
-   if (!oc) return;
-   of = cfdata->o_files_ilist;
-   if (!of) return;
+   if (!(oc = cfdata->o_categories_ilist)) return;
+   if (!(of = cfdata->o_files_ilist)) return;
 
    for (n = 0; n < e_widget_ilist_count(oc); n++)
      e_widget_ilist_nth_icon_set(oc, n, NULL);
diff --git a/src/modules/conf_theme/module.desktop b/src/modules/conf_theme/module.desktop
index 66f88a9..b0d2a22 100644
--- a/src/modules/conf_theme/module.desktop
+++ b/src/modules/conf_theme/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Theme
 Name[de]=
+Name[eo]=Agordo - Etoso
 Name[es]=Configuración - Tema
 Name[fr]=
+Name[hu]=Beállítások - Téma
 Name[it]=Configurazione - Temi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_theme
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your theme preferences.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn preferojn de etoso.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar sus preferencias del tema.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ezzel a modullal beállíthadod az E17 témáját.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le preferenze per il vostro tema.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index 66f88a9..b0d2a22 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Theme
 Name[de]=
+Name[eo]=Agordo - Etoso
 Name[es]=Configuración - Tema
 Name[fr]=
+Name[hu]=Beállítások - Téma
 Name[it]=Configurazione - Temi
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_theme
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to configure your theme preferences.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi siajn preferojn de etoso.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para configurar sus preferencias del tema.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ezzel a modullal beállíthadod az E17 témáját.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per configurare le preferenze per il vostro tema.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_transitions/Makefile.in b/src/modules/conf_transitions/Makefile.in
index 0c41070..6f93ef0 100644
--- a/src/modules/conf_transitions/Makefile.in
+++ b/src/modules/conf_transitions/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_transitions/module.desktop b/src/modules/conf_transitions/module.desktop
index 6b8ed88..8a162b4 100644
--- a/src/modules/conf_transitions/module.desktop
+++ b/src/modules/conf_transitions/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Transitions
 Name[de]=
+Name[eo]=Agordo - Transiroj
 Name[es]=Configuración - Transiciones
 Name[fr]=
+Name[hu]=Beállítások - Átmenetek
 Name[it]=Configurazione - Transizioni
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_transitions
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to choose a default transition. Transitions are used upon wallpaper changes, among other things.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti defaŭltan transiron. Transiroj estas uzataj dum ŝanĝoj de tapeto interalie.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir la transición predeterminada. Las transiciones se usan cuando se cambia el fondo de pantalla, entre otras cosas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ennek segítségével be tudod állítani az alapértelmezett átmeneteket a munkaasztal váltásnál, és a háttérkép váltásnál.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per scegliere una transizione predefinita. Le transizioni sono usate al cambio di sfondo, e per altre cose.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
index 6b8ed88..8a162b4 100644
--- a/src/modules/conf_transitions/module.desktop.in
+++ b/src/modules/conf_transitions/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Transitions
 Name[de]=
+Name[eo]=Agordo - Transiroj
 Name[es]=Configuración - Transiciones
 Name[fr]=
+Name[hu]=Beállítások - Átmenetek
 Name[it]=Configurazione - Transizioni
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_transitions
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to choose a default transition. Transitions are used upon wallpaper changes, among other things.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti defaŭltan transiron. Transiroj estas uzataj dum ŝanĝoj de tapeto interalie.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Usado para elegir la transición predeterminada. Las transiciones se usan cuando se cambia el fondo de pantalla, entre otras cosas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ennek segítségével be tudod állítani az alapértelmezett átmeneteket a munkaasztal váltásnál, és a háttérkép váltásnál.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per scegliere una transizione predefinita. Le transizioni sono usate al cambio di sfondo, e per altre cose.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_wallpaper/Makefile.am b/src/modules/conf_wallpaper/Makefile.am
index 844e680..73a1a6d 100644
--- a/src/modules/conf_wallpaper/Makefile.am
+++ b/src/modules/conf_wallpaper/Makefile.am
@@ -25,7 +25,9 @@ module_la_SOURCES      = e_mod_main.c \
 			 e_int_config_wallpaper_gradient.h \
 			 e_int_config_wallpaper.h \
 			 e_int_config_wallpaper_import.c \
-			 e_int_config_wallpaper_import.h
+			 e_int_config_wallpaper_import.h \
+			 e_int_config_wallpaper_web.c \
+			 e_int_config_wallpaper_web.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_wallpaper/Makefile.in b/src/modules/conf_wallpaper/Makefile.in
index 363d77f..2a991f3 100644
--- a/src/modules/conf_wallpaper/Makefile.in
+++ b/src/modules/conf_wallpaper/Makefile.in
@@ -63,7 +63,7 @@ pkgLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkg_LTLIBRARIES)
 am_module_la_OBJECTS = e_mod_main.lo e_int_config_wallpaper.lo \
 	e_int_config_wallpaper_gradient.lo \
-	e_int_config_wallpaper_import.lo
+	e_int_config_wallpaper_import.lo e_int_config_wallpaper_web.lo
 module_la_OBJECTS = $(am_module_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -94,6 +94,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -106,6 +108,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -125,6 +128,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -150,6 +155,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -265,7 +271,9 @@ module_la_SOURCES = e_mod_main.c \
 			 e_int_config_wallpaper_gradient.h \
 			 e_int_config_wallpaper.h \
 			 e_int_config_wallpaper_import.c \
-			 e_int_config_wallpaper_import.h
+			 e_int_config_wallpaper_import.h \
+			 e_int_config_wallpaper_web.c \
+			 e_int_config_wallpaper_web.h
 
 module_la_LIBADD = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
@@ -344,6 +352,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_int_config_wallpaper.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_int_config_wallpaper_gradient.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_int_config_wallpaper_import.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_int_config_wallpaper_web.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
 
 .c.o:
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
index e475474..f2110ca 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -4,13 +4,13 @@
 #include "e.h"
 #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 void         _fill_data    (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          _adv_apply    (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_adv_create   (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 void         _fill_data(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          _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 static E_Config_Dialog *_e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int desk_x, int desk_y);
 
@@ -38,23 +38,22 @@ struct _E_Config_Wallpaper
 struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
-   Evas_Object *o_frame;
    Evas_Object *o_fm;
    Evas_Object *o_up_button;
    Evas_Object *o_preview;
    Evas_Object *o_theme_bg;
    Evas_Object *o_personal;
    Evas_Object *o_system;
-   int fmdir;
-
-   int use_theme_bg;
+   int fmdir, use_theme_bg;
    char *bg;
 
    /* advanced */
    int all_this_desk_screen;
+
    /* dialogs */
    E_Win *win_import;
    E_Dialog *dia_gradient;
+   E_Dialog *dia_web;
 };
 
 EAPI E_Config_Dialog *
@@ -67,7 +66,7 @@ EAPI E_Config_Dialog *
 e_int_config_wallpaper_desk(E_Container *con, const char *params)
 {
    int con_num, zone_num, desk_x, desk_y;
-   
+
    if (!params) return NULL;
    con_num = zone_num = desk_x = desk_y = -1;
    if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &desk_x, &desk_y) != 4)
@@ -86,9 +85,9 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    v = E_NEW(E_Config_Dialog_View, 1);
    cw = E_NEW(E_Config_Wallpaper, 1);
 
-   v->create_cfdata        = _create_data;
-   v->free_cfdata          = _free_data;
-   v->basic.apply_cfdata   = _basic_apply;
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply;
    v->basic.create_widgets = _basic_create;
 
    if (!(con_num == -1 && zone_num == -1 && desk_x == -1 && desk_y == -1))
@@ -116,8 +115,8 @@ EAPI void
 e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
 {
    E_Config_Dialog_Data *cfdata;
-   char path[4096];
-   
+   char path[PATH_MAX];
+
    cfdata = dia->cfdata;
    cfdata->fmdir = 1;
    e_widget_radio_toggle_set(cfdata->o_personal, 1);
@@ -127,17 +126,18 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
    cfdata->use_theme_bg = 0;
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, cfdata->use_theme_bg);
-   if (cfdata->o_fm) e_fm2_path_set(cfdata->o_fm, path, "/");
+   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");
-   if (cfdata->o_frame) e_widget_change(cfdata->o_frame);
+     e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, 
+                               "e/desktop/background");
+   if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
 EAPI void
 e_int_config_wallpaper_import_done(E_Config_Dialog *dia)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = dia->cfdata;
    cfdata->win_import = NULL;
 }
@@ -146,16 +146,25 @@ EAPI void
 e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = dia->cfdata;
    cfdata->dia_gradient = NULL;
 }
 
+EAPI void
+e_int_config_wallpaper_web_done(E_Config_Dialog *dia)
+{
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = dia->cfdata;
+   cfdata->dia_web = NULL;
+}
+
 EAPI void 
 e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data) 
 {
    const char *dev, *fpath;
-   
+
    if (!path) return;
    e_fm2_path_get(obj, &dev, &fpath);
    if (dev)
@@ -186,33 +195,21 @@ static void
 _cb_button_up(void *data1, void *data2)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data1;
-   if (cfdata->o_fm)
-     e_fm2_parent_go(cfdata->o_fm);
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+   if (cfdata->o_fm) e_widget_flist_parent_go(cfdata->o_fm);
 }
 
 static void
 _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
-   
-   cfdata = data;
+
+   if (!(cfdata = data)) return;
    if (!cfdata->o_fm) return;
-   if (!e_fm2_has_parent_get(cfdata->o_fm))
-     {
-	if (cfdata->o_up_button)
-	  e_widget_disabled_set(cfdata->o_up_button, 1);
-     }
-   else
-     {
-	if (cfdata->o_up_button)
-	  e_widget_disabled_set(cfdata->o_up_button, 0);
-     }
-   if (cfdata->o_frame)
-     e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
+   if (cfdata->o_up_button) 
+     e_widget_disabled_set(cfdata->o_up_button, 
+                           !e_widget_flist_has_parent_get(cfdata->o_fm));
 }
 
 static void
@@ -222,48 +219,48 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
    Evas_List *selected;
    E_Fm2_Icon_Info *ici;
    const char *realpath;
-   char buf[4096];
-   
+   char buf[PATH_MAX];
+
    cfdata = data;
    if (!cfdata->o_fm) return;
-   selected = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!selected) return;
+   if (!(selected = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
    ici = selected->data;
-   realpath = e_fm2_real_path_get(cfdata->o_fm);
+   realpath = e_widget_flist_real_path_get(cfdata->o_fm);
    if (!strcmp(realpath, "/"))
      snprintf(buf, sizeof(buf), "/%s", ici->file);
    else
      snprintf(buf, sizeof(buf), "%s/%s", realpath, ici->file);
    evas_list_free(selected);
    if (ecore_file_is_dir(buf)) return;
+
    E_FREE(cfdata->bg);
+
    cfdata->bg = strdup(buf);
    if (cfdata->o_preview)
      e_widget_preview_edje_set(cfdata->o_preview, buf, "e/desktop/background");
    if (cfdata->o_theme_bg)
      e_widget_check_checked_set(cfdata->o_theme_bg, 0);
    cfdata->use_theme_bg = 0;
-   if (cfdata->o_frame) e_widget_change(cfdata->o_frame);
+   e_widget_change(cfdata->o_fm);
 }
 
 static void
 _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
-   const char *p, *homedir;
-   char buf[4096];
-   
+   const char *p = NULL;
+   char buf[PATH_MAX];
+
    cfdata = data;
-   if (!cfdata->bg) return;
-   if (!cfdata->o_fm) return;
-   p = e_fm2_real_path_get(cfdata->o_fm);
+   if ((!cfdata->bg) || (!cfdata->o_fm)) return;
+   p = e_widget_flist_real_path_get(cfdata->o_fm);
    if (p)
      {
 	if (strncmp(p, cfdata->bg, strlen(p))) return;
      }
-   homedir = e_user_homedir_get();
-   snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", homedir);
-   if (!p) return;
+   else return;
+
+   snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get());
    if (!strncmp(cfdata->bg, buf, strlen(buf)))
      p = cfdata->bg + strlen(buf) + 1;
    else
@@ -275,8 +272,8 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
 	  p = cfdata->bg;
      }
 
-   e_fm2_select_set(cfdata->o_fm, p, 1);
-   e_fm2_file_show(cfdata->o_fm, p);
+   e_widget_flist_select_set(cfdata->o_fm, p, 1);
+   e_widget_flist_file_show(cfdata->o_fm, p);
 }
 
 static void
@@ -285,18 +282,14 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
    E_Config_Dialog_Data *cfdata;
    Evas_List *sel, *all, *n;
    E_Fm2_Icon_Info *ici, *ic;
-   
+
    cfdata = data;
-   if (!cfdata->bg) return;
-   if (!cfdata->o_fm) return;
+   if ((!cfdata->bg) || (!cfdata->o_fm)) return;
 
-   all = e_fm2_all_list_get(cfdata->o_fm);
-   if (!all) return;
-   sel = e_fm2_selected_list_get(cfdata->o_fm);
-   if (!sel) return;
+   if (!(all = e_widget_flist_all_list_get(cfdata->o_fm))) return;
+   if (!(sel = e_widget_flist_selected_list_get(cfdata->o_fm))) return;
 
    ici = sel->data;
-   
    all = evas_list_find_list(all, ici);
    n = evas_list_next(all);
    if (!n) 
@@ -304,15 +297,14 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
 	n = evas_list_prev(all);
 	if (!n) return;
      }
-   
-   ic = n->data;
-   if (!ic) return;
-   
-   e_fm2_select_set(cfdata->o_fm, ic->file, 1);
-   e_fm2_file_show(cfdata->o_fm, ic->file);
-   
+
+   if (!(ic = n->data)) return;
+
+   e_widget_flist_select_set(cfdata->o_fm, ic->file, 1);
+   e_widget_flist_file_show(cfdata->o_fm, ic->file);
+
    evas_list_free(n);
-   
+
    evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata);
 }
 
@@ -321,23 +313,27 @@ _cb_theme_wallpaper(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    const char *f;
-   
+
    cfdata = data;
    if (cfdata->use_theme_bg)
      {
-	f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
+	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_widget_preview_edje_set(cfdata->o_preview, f, 
+                                    "e/desktop/background");
      }
    else
      {
-	evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata);
+	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");
+	       e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg, 
+                                         "e/desktop/background");
 	  }
      }
 }
@@ -346,21 +342,21 @@ static void
 _cb_dir(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
-   char path[4096];
-   
+   char path[PATH_MAX];
+
    cfdata = data;
    if (cfdata->fmdir == 1)
      snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get());
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
-   e_fm2_path_set(cfdata->o_fm, path, "/");
+   e_widget_flist_path_set(cfdata->o_fm, path, "/");
 }
 
 static void
 _cb_import(void *data1, void *data2)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data1;
    if (cfdata->win_import)
      e_win_raise(cfdata->win_import);
@@ -372,7 +368,7 @@ static void
 _cb_gradient(void *data1, void *data2)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data1;
    if (cfdata->dia_gradient)
      e_win_raise(cfdata->dia_gradient->win);
@@ -381,17 +377,29 @@ _cb_gradient(void *data1, void *data2)
 }
 
 static void
+_cb_web(void *data1, void *data2)
+{
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = data1;
+   if (cfdata->dia_web)
+      e_win_raise(cfdata->dia_web->win);
+   else
+      cfdata->dia_web = e_int_config_wallpaper_web(cfdata->cfd);   
+}
+
+static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
-   char path[4096];
    E_Config_Wallpaper *cw;
    const E_Config_Desktop_Background *cfbg;
-  
-   cw = cfdata->cfd->data;
+   char path[PATH_MAX];
 
+   cw = cfdata->cfd->data;
    if (cw->specific_config)
      {
 	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);
@@ -422,20 +430,20 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	     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;
 
-	f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
-	if (!strcmp(cfdata->bg, f))
-	  cfdata->use_theme_bg = 1;
-	snprintf(path, sizeof(path), "%s/data/backgrounds", e_prefix_data_get());
-	if (!strncmp(cfdata->bg, path, strlen(path)))
-	  cfdata->fmdir = 1;
+	f = e_theme_edje_file_get("base/theme/backgrounds", 
+                                  "e/desktop/background");
+	if (!strcmp(cfdata->bg, f)) cfdata->use_theme_bg = 1;
+	snprintf(path, sizeof(path), "%s/data/backgrounds", 
+                 e_prefix_data_get());
+	if (!strncmp(cfdata->bg, path, strlen(path))) cfdata->fmdir = 1;
      }
    else
      cfdata->use_theme_bg = 1;
@@ -460,6 +468,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_int_config_wallpaper_del(cfdata->win_import);
    if (cfdata->dia_gradient) 
      e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
+   if (cfdata->dia_web)
+     e_int_config_wallpaper_web_del(cfdata->dia_web);
    E_FREE(cfdata->bg);
    E_FREE(cfd->data);
    E_FREE(cfdata);
@@ -472,8 +482,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    Evas_Object *ow, *of, *oa;
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
-   char path[4096];
-   E_Fm2_Config fmc;
+   char path[PATH_MAX];
    int mw, mh;
    const char *f;
 
@@ -505,50 +514,25 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
 
-   /* add file selector */
-   ow = e_fm2_add(evas);
+   ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
-   memset(&fmc, 0, sizeof(E_Fm2_Config));
-   fmc.view.mode = E_FM2_VIEW_MODE_LIST;
-   fmc.view.open_dirs_in_place = 1;
-   fmc.view.selector = 1;
-   fmc.view.single_click = 0;
-   fmc.view.no_subdir_jump = 0;
-   fmc.icon.list.w = 48;
-   fmc.icon.list.h = 48;
-   fmc.icon.fixed.w = 1;
-   fmc.icon.fixed.h = 1;
-   fmc.icon.extension.show = 0;
-   fmc.icon.key_hint = NULL;
-   fmc.list.sort.no_case = 1;
-   fmc.list.sort.dirs.first = 0;
-   fmc.list.sort.dirs.last = 1;
-   fmc.selection.single = 1;
-   fmc.selection.windows_modifiers = 0;
-   e_fm2_config_set(ow, &fmc);
-   e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
    evas_object_smart_callback_add(ow, "dir_changed",
 				  _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_files_changed, 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);
-   e_fm2_path_set(ow, path, "/");
-
-   of = e_widget_scrollframe_pan_add(evas, ow,
-				     e_fm2_pan_set,
-				     e_fm2_pan_get,
-				     e_fm2_pan_max_get,
-				     e_fm2_pan_child_size_get);
-   cfdata->o_frame = of;
-   e_widget_min_size_set(of, 160, 160);
-   e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_flist_path_set(ow, path, "/");
+
+   e_widget_min_size_set(ow, 60, 60);
+   e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1);
    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"), &cfdata->use_theme_bg);
+   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, 1, 1, 0, 0, 0);
@@ -558,6 +542,12 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
 			    _cb_gradient, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
+   if (ecore_file_download_protocol_available("http://"))
+   {
+      ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+			       _cb_web, cfdata, NULL);
+      e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
+   }
 
    mw = 320;
    mh = (320 * zone->h) / zone->w;
@@ -571,7 +561,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    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, 4, 1, 1, 1, 1, 1);
-
    e_widget_list_object_append(o, ot, 1, 0, 0.5);
    e_dialog_resizable_set(cfd->dia, 1);
    return o;
@@ -595,6 +584,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	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);
 	  }
@@ -618,8 +608,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    Evas_Object *ow, *of, *oa;
    E_Zone *zone = NULL;
    E_Radio_Group *rg;
-   char path[4096];
-   E_Fm2_Config fmc;
+   char path[PATH_MAX];
    int mw, mh;
    const char *f;
 
@@ -651,50 +640,23 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    else
      snprintf(path, sizeof(path), "%s/.e/e/backgrounds", e_user_homedir_get());
 
-   /* add file selector */
-   ow = e_fm2_add(evas);
+   ow = e_widget_flist_add(evas);
    cfdata->o_fm = ow;
-   memset(&fmc, 0, sizeof(E_Fm2_Config));
-   fmc.view.mode = E_FM2_VIEW_MODE_LIST;
-   fmc.view.open_dirs_in_place = 1;
-   fmc.view.selector = 1;
-   fmc.view.single_click = 0;
-   fmc.view.no_subdir_jump = 0;
-   fmc.icon.list.w = 48;
-   fmc.icon.list.h = 48;
-   fmc.icon.fixed.w = 1;
-   fmc.icon.fixed.h = 1;
-   fmc.icon.extension.show = 0;
-   fmc.icon.key_hint = NULL;
-   fmc.list.sort.no_case = 1;
-   fmc.list.sort.dirs.first = 0;
-   fmc.list.sort.dirs.last = 1;
-   fmc.selection.single = 1;
-   fmc.selection.windows_modifiers = 0;
-   e_fm2_config_set(ow, &fmc);
-   e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
    evas_object_smart_callback_add(ow, "dir_changed",
 				  _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_files_changed, cfdata);
-   evas_object_smart_callback_add(ow, "files_deleted",
-				  _cb_files_files_deleted, cfdata);
-   e_fm2_path_set(ow, path, "/");
-
-   of = e_widget_scrollframe_pan_add(evas, ow,
-				     e_fm2_pan_set,
-				     e_fm2_pan_get,
-				     e_fm2_pan_max_get,
-				     e_fm2_pan_child_size_get);
-   cfdata->o_frame = of;
-   e_widget_min_size_set(of, 160, 160);
-   e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _cb_files_files_changed, cfdata);
+   e_widget_flist_path_set(ow, path, "/");
+
+   e_widget_min_size_set(ow, 160, 160);
+   e_widget_table_object_append(ot, ow, 0, 2, 1, 1, 1, 1, 1, 1);
    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"), &cfdata->use_theme_bg);
+   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, 1, 1, 0, 0, 0);
@@ -704,6 +666,12 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
 			    _cb_gradient, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
+   if (ecore_file_download_protocol_available("http://"))
+   {
+      ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+			       _cb_web, cfdata, NULL);
+      e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
+   }
 
    mw = 320;
    mh = (320 * zone->h) / zone->w;
@@ -742,11 +710,9 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    Evas_List *fl = NULL, *l;
    E_Zone *z;
    E_Desk *d;
-   
-   z = e_zone_current_get(cfdata->cfd->con);
-   if (!z) return 0;
-   d = e_desk_current_get(z);
-   if (!d) return 0;
+
+   if (!(z = e_zone_current_get(cfdata->cfd->con))) return 0;
+   if (!(d = e_desk_current_get(z))) return 0;
    if (cfdata->use_theme_bg)
      {
 	while (e_config->desktop_backgrounds)
@@ -784,7 +750,7 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	     for (l = e_config->desktop_backgrounds; l; l = l->next)
 	       {
 		  E_Config_Desktop_Background *cfbg;
-		  
+
 		  cfbg = l->data;
 		  if ((cfbg->container == z->container->num) &&
 		      (cfbg->zone == z->id))
@@ -795,7 +761,8 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 		  E_Config_Desktop_Background *cfbg;
 
 		  cfbg = fl->data;
-		  e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+		  e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, 
+                           cfbg->desk_y);
 		  fl = evas_list_remove_list(fl, fl);
 	       }
 	     e_bg_add(z->container->num, z->id, -1, -1, cfdata->bg);
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.h b/src/modules/conf_wallpaper/e_int_config_wallpaper.h
index 5e2ad49..c22a579 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.h
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.h
@@ -13,6 +13,7 @@ EAPI E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *
 EAPI void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file);
 EAPI void e_int_config_wallpaper_import_done(E_Config_Dialog *dia);
 EAPI void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia);
+EAPI void e_int_config_wallpaper_web_done(E_Config_Dialog *dia);
 
 EAPI void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data);
 EAPI int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data);
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
index ef98794..506ef5c 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -16,13 +16,13 @@ struct _Import
 {
    E_Config_Dialog *parent;
    E_Config_Dialog_Data *cfdata;
-   
+
    Evas_Object *bg_obj;
    Evas_Object *box_obj;
    Evas_Object *event_obj;
    Evas_Object *content_obj;
    Evas_Object *fsel_obj;
-   
+
    Evas_Object *ok_obj;
    Evas_Object *close_obj;
 
@@ -35,9 +35,9 @@ struct _Import
    Evas_Object *quality_obj;
    Evas_Object *frame_fill_obj;
    Evas_Object *frame_quality_obj;
-   
+
    E_Win *win;
-   
+
    Ecore_Exe *exe;
    Ecore_Event_Handler *exe_handler;
    char *tmpf;
@@ -77,7 +77,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    E_Config_Dialog_Data *cfdata;
    Evas_Modifier_Mask mask;
    const char *fdev, *fpath;
-   
+
    import = E_NEW(Import, 1);
    if (!import) return NULL;
 
@@ -88,34 +88,33 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
 
    if (!win) 
      { 
-	free(import);
+	E_FREE(import);
 	return NULL;	
      }
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->method = IMPORT_STRETCH;
    cfdata->external = 0;
    cfdata->quality = 90;
    import->cfdata = cfdata;
    import->win = win;
-   
+
    evas = e_win_evas_get(win);
 
-   if (parent)
-     import->parent = parent;
+   if (parent) import->parent = parent;
 
    e_win_title_set(win, _("Select a Picture..."));
    e_win_delete_callback_set(win, _import_cb_delete);
    e_win_resize_callback_set(win, _import_cb_resize);
    e_win_dialog_set(win, 1);
    e_win_name_class_set(win, "E", "_wallpaper_import_dialog");
-   
+
    o = edje_object_add(evas);
    import->bg_obj = o;
    e_theme_edje_object_set(o, "base/theme/dialog", "e/widgets/dialog/main");
    evas_object_move(o, 0, 0);
    evas_object_show(o);
-   
+
    o = e_widget_list_add(evas, 1, 1);
    e_widget_on_focus_hook_set(o, _import_cb_wid_on_focus, import);
    import->box_obj = o;
@@ -132,8 +131,9 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    mask = 0;
-   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _import_cb_key_down, import);
-   
+   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, 
+                                  _import_cb_key_down, import);
+
    o = e_widget_list_add(evas, 0, 0);   
    import->content_obj = o;
 
@@ -152,7 +152,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    e_widget_list_object_append(o, ofm, 1, 1, 0.5);
 
    ot = e_widget_table_add(evas, 0);
-   
+
    of = e_widget_frametable_add(evas, _("Fill and Stretch Options"), 1);
    import->frame_fill_obj = of;
    rg = e_widget_radio_group_new(&cfdata->method);
@@ -182,7 +182,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->fill_fill_obj = ord;
    e_widget_frametable_object_append(of, ord, 4, 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);
    import->frame_quality_obj = of;
    ord = e_widget_check_add(evas, _("Use original file"), &(cfdata->external));
@@ -193,14 +193,14 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->quality_obj = ord;
    e_widget_frametable_object_append(of, ord, 0, 1, 1, 1, 1, 0, 1, 0);
    e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 0);
-   
+
    e_widget_list_object_append(o, ot, 0, 0, 0.5);
-   
+
    e_widget_min_size_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.content", o);
    evas_object_show(o);
-   
+
    import->ok_obj = e_widget_button_add(evas, _("OK"), NULL, 
 					_import_cb_ok, win, cfdata);
    e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
@@ -208,14 +208,14 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    import->close_obj = e_widget_button_add(evas, _("Cancel"), NULL, 
 					   _import_cb_close, win, NULL);
    e_widget_list_object_append(import->box_obj, import->close_obj, 1, 0, 0.5);
-   
+
    e_win_centered_set(win, 1);
-   
+
    o = import->box_obj;
    e_widget_min_size_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
-   
+
    edje_object_size_min_calc(import->bg_obj, &w, &h);
    evas_object_resize(import->bg_obj, w, h);
    e_win_resize(win, w, h);
@@ -223,12 +223,12 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    e_win_size_max_set(win, 99999, 99999);
    e_win_show(win);
    e_win_border_icon_set(win, "enlightenment/background");
-   
+
    if (!e_widget_focus_get(import->bg_obj))
      e_widget_focus_set(import->box_obj, 1);
-   
+
    win->data = import;
-   
+
    _import_opt_disabled_set(import, 1);
    return win;
 }
@@ -237,7 +237,7 @@ EAPI void
 e_int_config_wallpaper_del(E_Win *win)
 {
    Import *import;
-   
+
    import = win->data;
    _import_path_save(import);
    if (import->exe_handler) ecore_event_handler_del(import->exe_handler);
@@ -272,7 +272,7 @@ static void
 _import_cb_sel_selected(void *data, Evas_Object *obj)
 {
    Import *import;
-   
+
    import = data;
    _import_cb_ok(import->win, NULL);
 }
@@ -282,7 +282,7 @@ _import_cb_sel_change(void *data, Evas_Object *obj)
 {
    Import *import;
    const char *path, *p = NULL;
-   
+
    import = data;
    path = e_widget_fsel_selection_path_get(import->fsel_obj);
    E_FREE(import->cfdata->file);
@@ -298,7 +298,7 @@ static void
 _import_path_save(Import *import)
 {
    const char *fdev = NULL, *fpath = NULL;
-   
+
    e_widget_fsel_path_get(import->fsel_obj, &fdev, &fpath);
    if ((fdev) || (fpath))
      {
@@ -328,7 +328,7 @@ _import_edj_gen(Import *import)
    char *imgdir = NULL, *fstrip;
    int cr = 255, cg = 255, cb = 255, ca = 255;
    FILE *f;
-   
+
    evas = e_win_evas_get(import->win);
    file = ecore_file_file_get(import->cfdata->file);
    homedir = e_user_homedir_get();
@@ -350,14 +350,14 @@ _import_edj_gen(Import *import)
 	return;
      }
    close(fd);
-   
+
    f = fopen(tmpn, "w");
    if (!f) 
      {
 	printf("Cannot open %s for writing\n", tmpn);
 	return;
      }
-   
+
    imgdir = ecore_file_dir_get(import->cfdata->file);
    if (!imgdir) ipart[0] = '\0';
    else
@@ -370,7 +370,7 @@ _import_edj_gen(Import *import)
    evas_object_image_file_set(img, import->cfdata->file, NULL);
    evas_object_image_size_get(img, &w, &h);
    evas_object_del(img);   
-   
+
    if (import->cfdata->external)
      {
 	fstrip = strdup(e_util_filename_escape(import->cfdata->file));
@@ -475,7 +475,7 @@ _import_edj_gen(Import *import)
 	break;
      }
    free(fstrip);
-   
+
    fclose(f);
 
    snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s", 
@@ -494,7 +494,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
 {
    Import *import;
    Ecore_Exe_Event_Del *ev;
-   
+
    ev = event;
    import = data;
    if (ev->exe != import->exe) return 1;
@@ -523,9 +523,8 @@ static void
 _import_cb_resize(E_Win *win) 
 {
    Import *import;
-   
-   import = win->data;
-   if (!import) return;
+
+   if (!(import = win->data)) return;
    evas_object_resize(import->bg_obj, win->w, win->h);
 }
 
@@ -533,7 +532,7 @@ static void
 _import_cb_close(void *data, void *data2) 
 {
    E_Win *win;
-   
+
    win = data;
    e_int_config_wallpaper_del(win);
 }
@@ -548,10 +547,9 @@ _import_cb_ok(void *data, void *data2)
    const char *homedir;
    char buf[4096];
    int is_bg, is_theme;
-   
+
    win = data;
-   import = win->data;
-   if (!import) return;
+   if (!(import = win->data)) return;
    path = e_widget_fsel_selection_path_get(import->fsel_obj);
    E_FREE(import->cfdata->file);
    if (path) import->cfdata->file = strdup(path);
@@ -571,7 +569,7 @@ _import_cb_ok(void *data, void *data2)
 	     is_theme = 
 	       edje_file_group_exists(import->cfdata->file, 
 				      "e/widgets/border/default/border");
-	     
+
 	     if ((is_bg) && (!is_theme)) 
 	       {
 		  if (!ecore_file_cp(import->cfdata->file, buf)) 
@@ -602,7 +600,7 @@ _import_cb_ok(void *data, void *data2)
 		  return;		  
 	       }
 	  }
-	
+
 	e_win_hide(win);
 	return;
      }
@@ -613,7 +611,7 @@ static void
 _import_cb_wid_on_focus(void *data, Evas_Object *obj) 
 {
    Import *import;
-   
+
    import = data;
    if (obj == import->content_obj)
      e_widget_focused_object_clear(import->box_obj);
@@ -671,7 +669,7 @@ _import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event)
 	     (!strcmp(ev->keyname, "space"))))
      {
 	Evas_Object *o = NULL;
-	
+
 	if ((import->content_obj) && (e_widget_focus_get(import->content_obj)))
 	  o = e_widget_focused_object_get(import->content_obj);
 	else
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
new file mode 100644
index 0000000..05b7c17
--- /dev/null
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
@@ -0,0 +1,657 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+// Da usare per importare l'immagine : e_int_config_wallpaper_import(NULL);
+
+#include "e.h"
+#include "e_mod_main.h"
+
+#define D(x)  do {printf("### DBG line %d ### ", __LINE__); printf x; fflush(stdout);} while (0)
+
+#define	MAGIC_IMPORT 0x427781cb
+#define TEMPLATE "/tmp/wallpXXXXXX"
+
+typedef struct _Import Import;
+
+struct _Import
+{
+   int magic;
+
+   E_Config_Dialog *parent;
+   E_Config_Dialog_Data *cfdata;
+   E_Dialog *dia;
+};
+
+struct _E_Config_Dialog_Data 
+{
+   Evas_Object *ofm, *o, *osfm, *ol;
+   Ecore_List *thumbs, *names, *medias;
+   Ecore_Con_Url *ecu;
+   Ecore_Event_Handler *hdata, *hcomplete;
+   FILE *feed;
+   int ready_for_edj, pending_downloads, busy;
+   char *edj, *ol_val, *tmpdir;
+   const char *source;
+};
+
+static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info);
+static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info);
+static int  _feed_complete(void *data, int type, void *event);
+static int  _feed_data(void *data, int type, void *event);
+static void _get_feed(char *url, void *data);
+static void _parse_feed(void *data);
+static void _get_thumbs(void *data);
+static void _get_thumb_complete(void *data, const char *file, int status);
+static void _source_sel_cb(void *data);
+static void _reset(void *data);
+static int  _list_find(const char *str1, const char *str2);
+static void _dia_del_cb(void *obj);
+static void _dia_close_cb(void *data, E_Dialog *dia);
+static void _dia_ok_cb(void *data, E_Dialog *dia);
+static void _download_media(Import *import);
+static int  _download_media_progress_cb(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow);
+static void _download_media_complete_cb(void *data, const char *file, int status);
+
+EAPI E_Dialog *
+e_int_config_wallpaper_web(E_Config_Dialog *parent)
+{
+   Evas *evas;
+   E_Dialog *dia;
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   Evas_Object *o, *ol, *of, *ofm, *osfm;
+   Evas_Coord mw, mh;
+   E_Fm2_Config fmc;
+
+   import = E_NEW(Import, 1);
+   if (!import) return NULL;
+
+   import->magic = MAGIC_IMPORT;
+
+   dia = e_dialog_new(parent->con, "E", "_wallpaper_web_dialog");
+   if (!dia) 
+     {
+	E_FREE(import);
+	return NULL;
+     }
+
+   dia->data = import;
+   e_object_del_attach_func_set(E_OBJECT(dia), _dia_del_cb);
+   e_win_centered_set(dia->win, 1);
+
+   evas = e_win_evas_get(dia->win);
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
+   cfdata->ecu = ecore_con_url_new("http://fake.url");
+
+   cfdata->ready_for_edj = 0;
+   cfdata->pending_downloads = 0;
+   cfdata->busy = 0;
+   import->cfdata = cfdata;
+   import->dia = dia;
+
+   import->parent = parent;
+
+   e_dialog_title_set(dia, _("Choose a website from list..."));
+
+   o = e_widget_list_add(evas, 0, 1);
+   cfdata->o = o;
+   cfdata->thumbs = ecore_list_new();
+   ecore_list_free_cb_set(cfdata->thumbs, free);
+   cfdata->names = ecore_list_new();
+   ecore_list_free_cb_set(cfdata->names, free);
+   cfdata->medias = ecore_list_new();
+   ecore_list_free_cb_set(cfdata->medias, free);
+
+   of = e_widget_framelist_add(evas, "Sources", 1);
+   ol = e_widget_ilist_add(evas, 24, 24, &cfdata->ol_val);
+   cfdata->ol = ol;
+   e_widget_ilist_append(ol, NULL, _("get-e.org - Static"),
+                         _source_sel_cb, import,
+                         "http://www.get-e.org/Backgrounds/Static/feed.xml");
+   e_widget_ilist_append(ol, NULL, _("get-e.org  - Animated"),
+                         _source_sel_cb, import,
+                         "http://www.get-e.org/Backgrounds/Animated/feed.xml");
+   /*e_widget_ilist_append(ol, NULL, _("get-e.org - Local copy"),
+                         _source_sel_cb, import,
+                         "http://localhost/get_e_feed.xml");*/
+   /*e_widget_ilist_append(ol, NULL, "Flickr test",
+                         _source_sel_cb, import,
+                         "http://api.flickr.com/services/feeds/photos_public.gne?tags=birro&lang=it-it&format=rss_200_enc");*/
+   e_widget_ilist_go(ol);
+   e_widget_min_size_get(ol, &mw, NULL);
+   e_widget_min_size_set(ol, mw, 320);
+   e_widget_framelist_object_append(of, ol);
+   e_widget_list_object_append(o, of, 1, 0, 0.5);
+
+   ofm = e_fm2_add(evas);
+   memset(&fmc, 0, sizeof(E_Fm2_Config));
+   cfdata->ofm = ofm;
+   fmc.view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
+   fmc.view.open_dirs_in_place = 1;
+   fmc.view.selector = 1;
+   fmc.view.single_click = 0;
+   fmc.view.no_subdir_jump = 0;
+   fmc.icon.list.w = 48;
+   fmc.icon.list.h = 48;
+   fmc.icon.icon.w = 96;
+   fmc.icon.icon.h = 96;
+   fmc.icon.fixed.w = 0;
+   fmc.icon.fixed.h = 0;
+   fmc.icon.extension.show = 0;
+   fmc.icon.key_hint = NULL;
+   fmc.list.sort.no_case = 1;
+   fmc.list.sort.dirs.first = 0;
+   fmc.list.sort.dirs.last = 1;
+   fmc.selection.single = 1;
+   fmc.selection.windows_modifiers = 0;
+   e_fm2_config_set(ofm, &fmc);
+   e_fm2_icon_menu_flags_set(ofm, E_FM2_MENU_NO_SHOW_HIDDEN);
+
+   evas_object_smart_callback_add(ofm, "selected",
+                                  _file_double_click_cb, import);
+   evas_object_smart_callback_add(ofm, "selection_change",
+                                  _file_click_cb, import);
+
+   osfm = e_widget_scrollframe_pan_add(evas, ofm,
+                                       e_fm2_pan_set,
+                                       e_fm2_pan_get,
+                                       e_fm2_pan_max_get,
+                                       e_fm2_pan_child_size_get);
+   cfdata->osfm = osfm;
+   e_widget_list_object_append(cfdata->o, cfdata->osfm, 1, 1, 0.5);
+   e_widget_min_size_set(osfm, 320, 320);
+
+//   e_widget_min_size_set(o, 580, 370);
+   e_widget_min_size_get(o, NULL, &mh);
+   e_dialog_content_set(dia, o, 480, mh);
+
+   e_dialog_button_add(dia, _("OK"), NULL, _dia_ok_cb, import);
+   e_dialog_button_add(dia, _("Cancel"), NULL, _dia_close_cb, import);
+   e_dialog_button_disable_num_set(dia, 0, 1);
+
+   e_dialog_resizable_set(dia, 1);
+   e_dialog_show(dia);
+
+   e_dialog_border_icon_set(dia, "enlightenment/background");
+
+   return dia;
+}
+
+void
+e_int_config_wallpaper_web_del(E_Dialog *dia)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+
+   import = dia->data;
+   cfdata = import->cfdata;
+
+   if (cfdata->pending_downloads == 1)
+     ecore_file_download_abort_all();
+   if (cfdata->ecu)
+     ecore_con_url_destroy(cfdata->ecu);
+
+   if (cfdata->hdata)
+     ecore_event_handler_del(cfdata->hdata);
+   if (cfdata->hcomplete)
+     ecore_event_handler_del(cfdata->hcomplete);
+
+   if (cfdata->tmpdir)
+     {
+	if (ecore_file_is_dir(cfdata->tmpdir))
+	  {
+	     ecore_file_recursive_rm(cfdata->tmpdir);
+	     ecore_file_rmdir(cfdata->tmpdir);
+	  }
+	free(cfdata->tmpdir);
+     }
+   ecore_list_destroy(cfdata->thumbs);
+   ecore_list_destroy(cfdata->names);
+   ecore_list_destroy(cfdata->medias);
+
+   e_int_config_wallpaper_web_done(import->parent);
+   E_FREE(import->cfdata);
+   E_FREE(import);
+   e_object_unref(E_OBJECT(dia));
+}
+
+static int 
+_feed_complete(void *data, int type, void *event)
+{
+   Ecore_Con_Event_Url_Complete *euc;
+   E_Config_Dialog_Data *cfdata;
+   Import *import;
+   char title[4096];
+
+   euc = (Ecore_Con_Event_Url_Complete *)event;
+   import = data;
+   if (import->magic != MAGIC_IMPORT) return 1;
+
+   cfdata = import->cfdata;
+   if (cfdata->ecu != euc->url_con) return 1;
+
+   fclose(cfdata->feed);
+   cfdata->feed = NULL;
+   ecore_event_handler_del(cfdata->hdata);
+   ecore_event_handler_del(cfdata->hcomplete);
+   cfdata->hdata = NULL;
+   cfdata->hcomplete = NULL;
+   if (euc->status == 200)
+     {
+        snprintf(title, sizeof(title), _("[%s] Getting feed... DONE!"), 
+                 cfdata->source);
+	e_dialog_title_set(import->dia, title);
+	_parse_feed(data);
+	return 0;
+     }
+   else
+     {
+        snprintf(title, sizeof(title), _("[%s] Getting feed... FAILED!"), 
+                 cfdata->source);
+	e_dialog_title_set(import->dia, title);
+     }
+   return 0;
+}
+
+static int
+_feed_data(void *data, int type, void *event)
+{
+   Ecore_Con_Event_Url_Data *eud;
+   E_Config_Dialog_Data *cfdata;
+   Import *import;
+
+   eud = (Ecore_Con_Event_Url_Data *)event;
+   import = data;
+   if (import->magic != MAGIC_IMPORT) return 1;
+
+   cfdata = import->cfdata;
+
+   if (cfdata->ecu != eud->url_con) return 1;
+
+   fwrite(eud->data, sizeof(unsigned char), eud->size, cfdata->feed);
+   return 0;
+}
+
+static void
+_source_sel_cb(void *data)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+
+   import = data;
+   cfdata = import->cfdata;
+   if ((cfdata->busy == 0) && (cfdata->pending_downloads == 0))
+     {
+	cfdata->source = e_widget_ilist_selected_label_get(cfdata->ol);
+	_reset(import);
+	cfdata->busy = 1;
+	_get_feed(cfdata->ol_val, import);
+     }
+   else 
+     e_widget_ilist_unselect(cfdata->ol);
+}
+
+static void
+_parse_feed(void *data)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   FILE *fh;
+   char instr[1024];
+   char *edj, *img, *name;
+   char title[4096];
+   int state = -1;
+
+   import = data;
+   cfdata = import->cfdata;
+
+   cfdata->pending_downloads = 0;
+   fh = fopen("/tmp/feed.xml", "r");
+   while (fgets(instr, sizeof(instr), fh) != NULL)
+     {
+	if (strstr(instr, "<rss version") != NULL) state = 0;
+	if ((strstr(instr, "<item>") != NULL) && (state == 0))
+	  {
+	     edj = NULL;
+	     img = NULL;
+	     state = 1;
+	  }
+
+	if ((strstr(instr, "<title>") !=  NULL) && (state == 1))
+	  {
+	     char *p;
+
+	     name = strchr(instr, '>');
+	     name++;
+	     p = strchr(name, '<');
+	     *p = 0;
+	     name = strdup(name);
+	     state = 2;
+	  }
+
+	if ((strstr(instr, "<link>") !=  NULL) && (state == 2))
+	  {
+	     char *p;
+
+	     edj = strchr(instr, '>');
+	     edj++;
+	     p = strchr(edj, '<');
+	     *p = 0;
+	     p = strrchr(ecore_file_file_get(edj), '.');
+	     if (!strcmp(p, ".edj"))
+	       {
+		  edj = strdup(edj);
+		  state = 3;
+	       }
+	  }
+
+	if ((strstr(instr, "<enclosure") != NULL) && (state == 3))
+	  {
+	     char *p;
+
+	     img = strstr(instr, "url=");
+	     img += 5;
+	     p = strchr(img, '"');
+	     *p = 0;
+	     img = strdup(img);
+	     state = 4;
+	  }
+
+	if ((strstr(instr, "</item>") != NULL) && (state == 4))
+	  {
+	     ecore_list_append(cfdata->thumbs, img);
+	     ecore_list_append(cfdata->names, name);
+	     ecore_list_append(cfdata->medias, edj);
+	     state = 0;
+	  }
+     }
+   fclose(fh);
+
+   if (state == 0)
+     {
+        snprintf(title, sizeof(title), _("[%s] Parsing feed... DONE!"), 
+                 cfdata->source);
+	e_dialog_title_set(import->dia, title);
+	e_fm2_path_set(cfdata->ofm, cfdata->tmpdir, "/");
+	_get_thumbs(import);
+     } 
+   else
+     {
+        snprintf(title, sizeof(title), _("[%s] Parsing feed... FAILED!"), 
+                 cfdata->source);
+	cfdata->busy = 0;
+	e_dialog_title_set(import->dia, title);
+     }
+}
+
+static void
+_get_thumbs(void *data)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   char *src, *name, *ext;
+   char dtmp[4096], dest[4096];
+
+   import = data;
+   cfdata = import->cfdata;
+   cfdata->pending_downloads = 1;
+   snprintf(dtmp, sizeof(dtmp), "%s/.tmp", cfdata->tmpdir);
+   ecore_file_mkdir(dtmp);
+   ecore_list_first_goto(cfdata->thumbs);
+   ecore_list_first_goto(cfdata->names);
+   while ((src = ecore_list_next(cfdata->thumbs)))
+     {
+	name = ecore_list_next(cfdata->names);
+	ext = strrchr(src, '.');
+        snprintf(dest, sizeof(dest), "%s/%s%s", dtmp, name, ext);
+	ecore_file_download(src, dest, _get_thumb_complete, NULL, import);
+     }
+}
+
+static void
+_dia_del_cb(void *obj)
+{
+   E_Dialog *dia = obj;
+
+   e_int_config_wallpaper_web_del(dia);
+}
+
+static void 
+_file_double_click_cb(void *data, Evas_Object *obj, void *ev_info)
+{
+   /*E_Config_Dialog_Data *cfdata;
+   Evas_List *sels;
+   E_Fm2_Icon_Info *icon_info;
+
+   cfdata = data;
+   sels = e_fm2_selected_list_get(cfdata->ofm);
+   if (!sels)
+      return;
+   icon_info = sels->data;
+   printf("[double click] %s\n", icon_info->file);*/
+   
+   // Unused atm, interesting to simulate click on Ok button
+}
+
+static void 
+_file_click_cb(void *data, Evas_Object *obj, void *ev_info)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   Evas_List *sels;
+   E_Fm2_Icon_Info *icon_info;
+
+   import = data;
+   cfdata = import->cfdata;
+   sels = e_fm2_selected_list_get(cfdata->ofm);
+   if (!sels) return;
+   if (cfdata->ready_for_edj == 0) return;
+
+   icon_info = sels->data;
+   if (ecore_list_find(cfdata->names, ECORE_COMPARE_CB(_list_find), icon_info->file))
+     cfdata->edj = ecore_list_index_goto(cfdata->medias, ecore_list_index(cfdata->names));
+}
+
+static int
+_list_find(const char *str1, const char *str2)
+{
+   return strcmp(str1, ecore_file_strip_ext(str2));
+}
+
+static void 
+_dia_close_cb(void *data, E_Dialog *dia) 
+{
+   e_int_config_wallpaper_web_del(dia);
+}
+
+static void 
+_dia_ok_cb(void *data, E_Dialog *dia)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   Evas_List *sels;
+
+   import = data;
+   cfdata = import->cfdata;
+   sels = e_fm2_selected_list_get(cfdata->ofm);
+   if (sels)
+     _download_media(import);
+   else
+     e_int_config_wallpaper_web_del(dia);
+}
+
+static void 
+_download_media(Import *import)
+{
+   Import *i;
+   E_Config_Dialog_Data *cfdata;
+   const char *file;
+   char buf[4096], title[4096];
+
+   i = import;
+   cfdata = i->cfdata;
+   
+   cfdata->pending_downloads = 1;
+   file = ecore_file_file_get(cfdata->edj);
+   snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", 
+            e_user_homedir_get(), file);
+   snprintf(title, sizeof(title), _("[%s] Downloading of edje file..."), 
+            cfdata->source);
+   e_dialog_title_set(i->dia, title);
+   ecore_file_download(cfdata->edj, buf,
+                       _download_media_complete_cb,
+                       _download_media_progress_cb, i);
+}
+
+static void 
+_download_media_complete_cb(void *data, const char *file, int status)
+{
+   Import *import;
+   char dest[4096];
+
+   import = data;
+   import->cfdata->pending_downloads = 0;
+   snprintf(dest, sizeof(dest), "%s/.e/e/backgrounds/%s", 
+            e_user_homedir_get(), ecore_file_file_get(import->cfdata->edj));
+   e_int_config_wallpaper_update(import->parent, dest);
+   e_int_config_wallpaper_web_del(import->dia);
+}
+
+static void
+_get_thumb_complete(void *data, const char *file, int status)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   char title[4096], dst[4096];
+   static int got = 1;
+
+   import = data;
+   cfdata = import->cfdata;
+   if (got != ecore_list_count(cfdata->thumbs))
+     {
+        snprintf(title, sizeof(title), _("[%s] Download %d images of %d"), 
+                 cfdata->source, got, ecore_list_index(cfdata->thumbs));
+	e_dialog_title_set(import->dia, title);
+	cfdata->ready_for_edj = 0;
+        snprintf(dst, sizeof(dst), "%s/%s", cfdata->tmpdir, 
+                 ecore_file_file_get(file));
+	ecore_file_mv(file, dst);
+	got++;
+     }
+   else
+     {
+	got = 1;
+	cfdata->busy = 0;
+	cfdata->ready_for_edj = 1;
+        snprintf(title, sizeof(title), _("[%s] Choose an image from list"), 
+                 cfdata->source);
+	e_dialog_title_set(import->dia, title);
+	e_dialog_button_disable_num_set(import->dia, 0, 0);
+	cfdata->pending_downloads = 0;
+     }
+}
+
+static int
+_download_media_progress_cb(void *data, const char *file, long int dltotal,
+			    long int dlnow, long int ultotal, long int ulnow)
+{
+   Import *import;
+   double status;
+   char title[4096];
+   static long int last;
+
+   import = data;
+
+   if ((dlnow == 0) || (dltotal == 0)) return 0;
+
+   if (last)
+     {
+	status = (double) ((double) dlnow) / ((double) dltotal);
+        snprintf(title, sizeof(title), _("[%s] Downloading of edje file... %d%% done"), 
+                 import->cfdata->source, (int) (status * 100.0));
+	e_dialog_title_set(import->dia, title);
+     }
+
+   last = dlnow;
+
+   return 0;
+}
+
+static void
+_get_feed(char *url, void *data)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+   extern int errno;
+   char title[4096];
+
+   import = data;
+   cfdata = import->cfdata;
+
+   cfdata->tmpdir = mkdtemp(strdup(TEMPLATE));
+
+   ecore_con_url_url_set(cfdata->ecu, url);
+   ecore_file_download_abort_all();
+   if (cfdata->hdata) ecore_event_handler_del(cfdata->hdata);
+   if (cfdata->hcomplete) ecore_event_handler_del(cfdata->hcomplete);
+   if (cfdata->feed) fclose(cfdata->feed);
+
+   cfdata->hdata = 
+     ecore_event_handler_add(ECORE_CON_EVENT_URL_DATA, _feed_data, import);
+   cfdata->hcomplete = 
+     ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, 
+                             _feed_complete, import);
+
+   snprintf(title, sizeof(title), _("[%s] Getting feed..."), cfdata->source);
+   e_dialog_title_set(import->dia, title); //
+   cfdata->feed = fopen("/tmp/feed.xml", "w+");
+   ecore_con_url_send(cfdata->ecu, NULL, 0, NULL);
+}
+
+static void
+_reset(void *data)
+{
+   Import *import;
+   E_Config_Dialog_Data *cfdata;
+
+   import = data;
+   cfdata = import->cfdata;
+
+   // If there's pending downloads, stop it
+   if (cfdata->pending_downloads == 1)
+     {
+	ecore_file_download_abort_all();
+	//ecore_file_download_shutdown();
+     }
+   cfdata->pending_downloads = 0;
+
+   // Reset busy state
+   cfdata->busy = 0;
+
+   // Clean lists
+   if (!ecore_list_empty_is(cfdata->thumbs))
+     ecore_list_clear(cfdata->thumbs);
+   if (!ecore_list_empty_is(cfdata->names))
+     ecore_list_clear(cfdata->names);
+   if (!ecore_list_empty_is(cfdata->medias))
+     ecore_list_clear(cfdata->medias);
+
+   // Clean existing data
+   if (ecore_file_exists("/tmp/feed.xml")) ecore_file_unlink("/tmp/feed.xml");
+
+   // Remove temporary data
+   if (cfdata->tmpdir)
+     {
+	if (ecore_file_is_dir(cfdata->tmpdir))
+	  {
+	     ecore_file_recursive_rm(cfdata->tmpdir);
+	     ecore_file_rmdir(cfdata->tmpdir);
+	  }
+     }
+
+   // Disable OK button
+   e_dialog_button_disable_num_set(import->dia, 0, 1);
+}
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h
new file mode 100644
index 0000000..34a7853
--- /dev/null
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h
@@ -0,0 +1,10 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_WALLPAPER_WEB_H
+#define E_INT_CONFIG_WALLPAPER_WEB_H
+
+EAPI E_Dialog *e_int_config_wallpaper_web(E_Config_Dialog *parent);
+EAPI void      e_int_config_wallpaper_web_del(E_Dialog *dia);
+    
+#endif
+#endif
diff --git a/src/modules/conf_wallpaper/e_mod_main.h b/src/modules/conf_wallpaper/e_mod_main.h
index 1d4c5c8..7d1d652 100644
--- a/src/modules/conf_wallpaper/e_mod_main.h
+++ b/src/modules/conf_wallpaper/e_mod_main.h
@@ -8,10 +8,12 @@
 #include "e_int_config_wallpaper.h"
 #include "e_int_config_wallpaper_import.h"
 #include "e_int_config_wallpaper_gradient.h"
+#include "e_int_config_wallpaper_web.h"
 #undef E_TYPEDEFS
 #include "e_int_config_wallpaper.h"
 #include "e_int_config_wallpaper_import.h"
 #include "e_int_config_wallpaper_gradient.h"
+#include "e_int_config_wallpaper_web.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_wallpaper/module.desktop b/src/modules/conf_wallpaper/module.desktop
index d3ea946..14c0c13 100644
--- a/src/modules/conf_wallpaper/module.desktop
+++ b/src/modules/conf_wallpaper/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Wallpaper
 Name[de]=
+Name[eo]=Agordo - Tapeto
 Name[es]=Configuración - Fondo de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Háttérkép
 Name[it]=Configurazione - Sfondo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_wallpaper
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to pick a wallpaper.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti tapeton.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Para elegir un fondo de pantalla.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Háttérkép beállító modul.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare uno sfondo.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
index d3ea946..14c0c13 100644
--- a/src/modules/conf_wallpaper/module.desktop.in
+++ b/src/modules/conf_wallpaper/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Wallpaper
 Name[de]=
+Name[eo]=Agordo - Tapeto
 Name[es]=Configuración - Fondo de pantalla
 Name[fr]=
+Name[hu]=Beállítások - Háttérkép
 Name[it]=Configurazione - Sfondo
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_wallpaper
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Used to pick a wallpaper.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Elekti tapeton.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Para elegir un fondo de pantalla.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Háttérkép beállító modul.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Usato per selezionare uno sfondo.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_window_display/Makefile.in b/src/modules/conf_window_display/Makefile.in
index b2a01ca..c9d2ae5 100644
--- a/src/modules/conf_window_display/Makefile.in
+++ b/src/modules/conf_window_display/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_window_display/module.desktop b/src/modules/conf_window_display/module.desktop
index 7c14f7f..52470f4 100644
--- a/src/modules/conf_window_display/module.desktop
+++ b/src/modules/conf_window_display/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Display
 Name[de]=
-Name[es]=Configuración - Visualización de ventanas
+Name[eo]=Agordo - Vidigo de fenestroj
+Name[es]=Configuración - Visualización de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak megjelenés
 Name[it]=Configurazione - Visualizzazione finestre
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_window_display
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures default window properties such as default geometries, border icons, placement styles, etc.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la defaŭltjan ecojn de fenestroj kiel geometrio, stilo de pozicio, randaj piktogramoj, ktp.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az alapértelmezett ablakbeállításokat tudod elvégezni a modul segítségével, úgy mint, elhelyezkedés, stílus, stb.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
index 7c14f7f..52470f4 100644
--- a/src/modules/conf_window_display/module.desktop.in
+++ b/src/modules/conf_window_display/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Display
 Name[de]=
-Name[es]=Configuración - Visualización de ventanas
+Name[eo]=Agordo - Vidigo de fenestroj
+Name[es]=Configuración - Visualización de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak megjelenés
 Name[it]=Configurazione - Visualizzazione finestre
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_window_display
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures default window properties such as default geometries, border icons, placement styles, etc.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la defaŭltjan ecojn de fenestroj kiel geometrio, stilo de pozicio, randaj piktogramoj, ktp.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az alapértelmezett ablakbeállításokat tudod elvégezni a modul segítségével, úgy mint, elhelyezkedés, stílus, stb.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_window_focus/Makefile.in b/src/modules/conf_window_focus/Makefile.in
index 8fc1c03..e34788a 100644
--- a/src/modules/conf_window_focus/Makefile.in
+++ b/src/modules/conf_window_focus/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_window_focus/module.desktop b/src/modules/conf_window_focus/module.desktop
index dd22ef8..a83e353 100644
--- a/src/modules/conf_window_focus/module.desktop
+++ b/src/modules/conf_window_focus/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Focus
 Name[de]=
+Name[eo]=Agordo - Fokuso de fenestroj
 Name[es]=Configuración - Foco de la ventana
 Name[fr]=
+Name[hu]=Beállítások - Ablak fókusz
 Name[it]=Configurazione - Fuoco delle finestre
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_window_focus
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure window focus behavior.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la konduton de enfokusiĝo de la fenestroj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del foco de las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az ablak fókusz beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento del fuoco delle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
index dd22ef8..a83e353 100644
--- a/src/modules/conf_window_focus/module.desktop.in
+++ b/src/modules/conf_window_focus/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Focus
 Name[de]=
+Name[eo]=Agordo - Fokuso de fenestroj
 Name[es]=Configuración - Foco de la ventana
 Name[fr]=
+Name[hu]=Beállítások - Ablak fókusz
 Name[it]=Configurazione - Fuoco delle finestre
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_window_focus
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure window focus behavior.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la konduton de enfokusiĝo de la fenestroj.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura el comportamiento del foco de las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az ablak fókusz beállítása.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura il comportamento del fuoco delle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_window_manipulation/Makefile.in b/src/modules/conf_window_manipulation/Makefile.in
index a05f904..fe5fcb6 100644
--- a/src/modules/conf_window_manipulation/Makefile.in
+++ b/src/modules/conf_window_manipulation/Makefile.in
@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -105,6 +107,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -124,6 +127,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -149,6 +154,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_window_manipulation/module.desktop b/src/modules/conf_window_manipulation/module.desktop
index 12cc2f4..afc082e 100644
--- a/src/modules/conf_window_manipulation/module.desktop
+++ b/src/modules/conf_window_manipulation/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Manipulation
 Name[de]=
+Name[eo]=Agordo - Manipulado de fenestroj
 Name[es]=Configuración - Manipulación de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak műveletek
 Name[it]=Configurazione - Manipolazione finestre
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_winmanip
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures window raise, resistance, and maximize policies.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi fenestrajn altigon, rezistadon kaj maksimumajn tiparojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las reglas para la subida, resistencia y maximización de las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ablak átméretezést, áthelyezést, maximálizálást beállító modul.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le regole per l'elevazione, la resistenza e la massimizzazione delle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
index 12cc2f4..afc082e 100644
--- a/src/modules/conf_window_manipulation/module.desktop.in
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window Manipulation
 Name[de]=
+Name[eo]=Agordo - Manipulado de fenestroj
 Name[es]=Configuración - Manipulación de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak műveletek
 Name[it]=Configurazione - Manipolazione finestre
 Name[ja]=
 Name[pt]=
@@ -13,8 +15,10 @@ Name[zh_TW]=
 Icon=e-module-conf_winmanip
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configures window raise, resistance, and maximize policies.
 Comment[de]=
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi fenestrajn altigon, rezistadon kaj maksimumajn tiparojn.
 Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las reglas para la subida, resistencia y maximización de las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Ablak átméretezést, áthelyezést, maximálizálást beállító modul.
 Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le regole per l'elevazione, la resistenza e la massimizzazione delle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/conf_window_remembers/Makefile.am b/src/modules/conf_window_remembers/Makefile.am
new file mode 100644
index 0000000..7ea4b1f
--- /dev/null
+++ b/src/modules/conf_window_remembers/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_window_remembers
+
+# 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_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_remembers.c \
+                         e_int_config_remembers.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/conf_window_remembers/Makefile.in b/src/modules/conf_window_remembers/Makefile.in
new file mode 100644
index 0000000..96e93b4
--- /dev/null
+++ b/src/modules/conf_window_remembers/Makefile.in
@@ -0,0 +1,571 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/modules/conf_window_remembers
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/module.desktop.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = module.desktop
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"
+pkgLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkg_LTLIBRARIES)
+am_module_la_OBJECTS = e_mod_main.lo e_int_config_remembers.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(module_la_SOURCES)
+DIST_SOURCES = $(module_la_SOURCES)
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+EDJE_DEF = @EDJE_DEF@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_DBUS_CFLAGS = @E_DBUS_CFLAGS@
+E_DBUS_LIBS = @E_DBUS_LIBS@
+E_HAL_CFLAGS = @E_HAL_CFLAGS@
+E_HAL_LIBS = @E_HAL_LIBS@
+E_LIBS = @E_LIBS@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
+HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
+HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
+HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
+HAVE_TEMPERATURE_TRUE = @HAVE_TEMPERATURE_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
+PACKAGE_LIB_DIR = @PACKAGE_LIB_DIR@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_SYSCONF_DIR = @PACKAGE_SYSCONF_DIR@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+USE_NLS = @USE_NLS@
+VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+VALGRIND_LIBS = @VALGRIND_LIBS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cf_cflags = @cf_cflags@
+cf_libs = @cf_libs@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dlopen_libs = @dlopen_libs@
+docdir = @docdir@
+dvidir = @dvidir@
+e_cflags = @e_cflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+exec_prefix = @exec_prefix@
+fnmatch_libs = @fnmatch_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_window_remembers
+
+# 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_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_remembers.c \
+                         e_int_config_remembers.h
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/conf_window_remembers/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/conf_window_remembers/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+module.desktop: $(top_builddir)/config.status $(srcdir)/module.desktop.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$p"; \
+	done
+
+clean-pkgLTLIBRARIES:
+	-test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
+	$(LINK) -rpath $(pkgdir) $(module_la_LDFLAGS) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_int_config_remembers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-filesDATA: $(files_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(filesdir)" || $(mkdir_p) "$(DESTDIR)$(filesdir)"
+	@list='$(files_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(filesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filesdir)/$$f'"; \
+	  $(filesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filesdir)/$$f"; \
+	done
+
+uninstall-filesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(files_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA uninstall-info-am \
+	uninstall-pkgLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkgLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-filesDATA install-info install-info-am \
+	install-man install-pkgLTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-filesDATA \
+	uninstall-info-am uninstall-pkgLTLIBRARIES
+
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj b/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj
new file mode 100644
index 0000000..b5546e3
Binary files /dev/null and b/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj differ
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c
new file mode 100644
index 0000000..d5820a9
--- /dev/null
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.c
@@ -0,0 +1,246 @@
+#include "e.h"
+
+/* function 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(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _fill_remembers(E_Config_Dialog_Data *cfdata);
+static void _cb_delete(void *data, void *data2);
+static void _cb_list_change(void *data, Evas_Object *obj);
+
+struct _E_Config_Dialog_Data 
+{
+   Evas_Object *list, *btn, *name, *class, *title, *role;
+};
+
+EAPI E_Config_Dialog *
+e_int_config_remembers(E_Container *con, const char *params __UNUSED__) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_remembers_dialog")) 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, _("Window Remembers"), "E", 
+                             "_config_remembers_dialog", 
+                             "enlightenment/window_remembers", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+   return cfd;
+}
+
+/* private functions */
+static int
+_cb_sort(void *data1, void *data2)
+{
+   E_Remember *rem1 = NULL;
+   E_Remember *rem2 = NULL;
+   const char *d1, *d2;
+
+   if (!(rem1 = data1)) return 1;
+   if (!(rem2 = data2)) return -1;
+
+   if (rem1->name)
+     d1 = rem1->name;
+   else if (rem1->class)
+     d1 = rem1->class;
+   else if (rem1->title)
+     d1 = rem1->title;
+   else if (rem1->role)
+     d1 = rem1->role;
+
+   if (rem2->name)
+     d2 = rem2->name;
+   else if (rem2->class)
+     d2 = rem2->class;
+   else if (rem2->title)
+     d2 = rem2->title;
+   else if (rem2->role)
+     d2 = rem2->role;
+
+   return strcmp(d1, d2);
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd) 
+{
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   return cfdata;
+}
+
+static void 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   E_FREE(cfdata);
+}
+
+static Evas_Object *
+_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *o, *of, *of2, *ow;
+
+   o = e_widget_list_add(evas, 0, 0);
+   of = e_widget_frametable_add(evas, _("Window Remembers"), 0);
+
+   ow = e_widget_button_add(evas, _("Delete Remember(s)"), NULL, _cb_delete, 
+                            cfdata, NULL);
+   cfdata->btn = ow;
+
+   ow = e_widget_ilist_add(evas, 24, 24, NULL);
+   cfdata->list = ow;
+   e_widget_ilist_multi_select_set(ow, 1);
+   e_widget_on_change_hook_set(ow, _cb_list_change, cfdata);
+   _fill_remembers(cfdata);
+
+   of2 = e_widget_frametable_add(evas, _("Details"), 0);
+   ow = e_widget_label_add(evas, _("Name:"));
+   e_widget_frametable_object_append(of2, ow, 0, 0, 1, 1, 1, 1, 0, 0);
+   ow = e_widget_label_add(evas, _("<No Name>"));
+   cfdata->name = ow;
+   e_widget_frametable_object_append(of2, cfdata->name, 1, 0, 1, 1, 1, 1, 1, 0);
+   ow = e_widget_label_add(evas, _("Class:"));
+   e_widget_frametable_object_append(of2, ow, 0, 1, 1, 1, 1, 1, 0, 0);
+   ow = e_widget_label_add(evas, _("<No Class>"));
+   cfdata->class = ow;
+   e_widget_frametable_object_append(of2, cfdata->class, 1, 1, 1, 1, 1, 1, 1, 0);
+   ow = e_widget_label_add(evas, _("Title:"));
+   e_widget_frametable_object_append(of2, ow, 0, 2, 1, 1, 1, 1, 0, 0);
+   ow = e_widget_label_add(evas, _("<No Title>"));
+   cfdata->title = ow;
+   e_widget_frametable_object_append(of2, cfdata->title, 1, 2, 1, 1, 1, 1, 1, 0);
+   ow = e_widget_label_add(evas, _("Role:"));
+   e_widget_frametable_object_append(of2, ow, 0, 3, 1, 1, 1, 1, 0, 0);
+   ow = e_widget_label_add(evas, _("<No Role>"));
+   cfdata->role = ow;
+   e_widget_frametable_object_append(of2, cfdata->role, 1, 3, 1, 1, 1, 1, 1, 0);
+
+   e_widget_frametable_object_append(of, cfdata->list, 0, 0, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, of2, 0, 1, 1, 1, 1, 1, 1, 0);
+   e_widget_frametable_object_append(of, cfdata->btn, 0, 2, 1, 1, 1, 1, 1, 0);
+
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   e_widget_disabled_set(cfdata->btn, 1);
+   return o;
+}
+
+static void 
+_fill_remembers(E_Config_Dialog_Data *cfdata) 
+{
+   Evas *evas;
+   Evas_List *l = NULL;
+   int w = 0;
+
+   evas = evas_object_evas_get(cfdata->list);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(cfdata->list);
+   e_widget_ilist_clear(cfdata->list);
+
+   l = e_config->remembers;
+   for (l = evas_list_sort(l, -1, _cb_sort); l; l = l->next) 
+   //for (l = e_config->remembers; l; l = l->next) 
+     {
+        E_Remember *rem = NULL;
+
+        if (!(rem = l->data)) continue;
+
+        /* Filter out E's own remember */
+        if ((rem->name) && (!strcmp(rem->name, "E"))) continue;
+
+        if (rem->name) 
+          e_widget_ilist_append(cfdata->list, NULL, rem->name, NULL, rem, NULL);
+        else if (rem->class) 
+          e_widget_ilist_append(cfdata->list, NULL, rem->class, NULL, rem, NULL);
+        else if (rem->title) 
+          e_widget_ilist_append(cfdata->list, NULL, rem->title, NULL, rem, NULL);
+        else if (rem->role) 
+          e_widget_ilist_append(cfdata->list, NULL, rem->role, NULL, rem, NULL);             
+     }
+
+   e_widget_ilist_go(cfdata->list);
+   e_widget_min_size_get(cfdata->list, &w, NULL);
+
+   /* NB: make the window look a bit better by not being so small */
+   if (w < 300) w = 300;
+
+   e_widget_min_size_set(cfdata->list, w, 200);
+   e_widget_ilist_thaw(cfdata->list);
+   edje_thaw();
+   evas_event_thaw(evas);
+
+   e_widget_disabled_set(cfdata->btn, 1);
+}
+
+static void 
+_cb_delete(void *data, void *data2) 
+{
+   E_Config_Dialog_Data *cfdata;
+   Evas_List *l = NULL, *b = NULL;
+   int i = 0, changed = 0;
+
+   if (!(cfdata = data)) return;
+   for (i = 0, l = e_widget_ilist_items_get(cfdata->list); l; l = l->next, i++) 
+     {
+        E_Ilist_Item *item = NULL;
+        E_Remember *rem = NULL;
+
+        item = l->data;
+        if ((!item) || (!item->selected)) continue;
+        if (!(rem = e_widget_ilist_nth_data_get(cfdata->list, i))) continue;
+        for (b = e_border_client_list(); b; b = b->next) 
+          {
+             E_Border *bd = NULL;
+
+             if (!(bd = b->data)) continue;
+             if (!bd->remember) continue;
+             if (bd->remember != rem) continue;
+             bd->remember = NULL;
+          }
+        e_remember_unuse(rem);
+        e_remember_del(rem);
+        changed = 1;
+     }
+
+   if (changed) e_config_save_queue();
+   if (1) evas_list_free(l);
+   if (b) evas_list_free(b);
+
+   _fill_remembers(cfdata);
+}
+
+static void 
+_cb_list_change(void *data, Evas_Object *obj) 
+{
+   E_Config_Dialog_Data *cfdata;
+   E_Ilist_Item *item = NULL;
+   E_Remember *rem = NULL;
+   int n = 0;
+   char *s;
+
+   if (!(cfdata = data)) return;
+
+   n = e_widget_ilist_selected_get(cfdata->list);
+   if ((rem = e_widget_ilist_nth_data_get(cfdata->list, n)))
+     {
+	e_widget_label_text_set(cfdata->name, rem->name ? 
+                                rem->name : _("<No Name>"));
+	e_widget_label_text_set(cfdata->class, rem->class ? 
+                                rem->class : _("<No Class>"));
+	e_widget_label_text_set(cfdata->title, rem->title ? 
+                                rem->title : _("<No Title>"));
+	e_widget_label_text_set(cfdata->role, rem->role ? 
+                                rem->role : _("<No Role>"));
+     }
+
+   if (e_widget_ilist_selected_count_get(cfdata->list) < 1)
+     e_widget_disabled_set(cfdata->btn, 1);
+   else
+     e_widget_disabled_set(cfdata->btn, 0);
+}
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.h b/src/modules/conf_window_remembers/e_int_config_remembers.h
new file mode 100644
index 0000000..3d344d3
--- /dev/null
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.h
@@ -0,0 +1,9 @@
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_INT_CONFIG_REMEMBERS_H
+#define E_INT_CONFIG_REMEMBERS_H
+
+EAPI E_Config_Dialog *e_int_config_remembers(E_Container *con, const char *params __UNUSED__);
+
+#endif
+#endif
diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c
new file mode 100644
index 0000000..9cebc41
--- /dev/null
+++ b/src/modules/conf_window_remembers/e_mod_main.c
@@ -0,0 +1,42 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+static E_Module *conf_module = NULL;
+
+EAPI E_Module_Api e_modapi = 
+{
+   E_MODULE_API_VERSION, "Configuration - Window Remembers"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, 
+                                     "enlightenment/windows");
+   e_configure_registry_item_add("windows/window_remembers", 40, 
+                                 _("Window Remembers"), NULL, 
+                                 "enlightenment/window_remembers", 
+                                 e_int_config_remembers);
+   conf_module = m;
+   e_module_delayed_set(m, 1);
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   E_Config_Dialog *cfd;
+
+   while ((cfd = e_config_dialog_get("E", "_config_remember_dialog")))
+     e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/window_remembers");
+   e_configure_registry_category_del("windows");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return 1;
+}
diff --git a/src/modules/conf_window_remembers/e_mod_main.h b/src/modules/conf_window_remembers/e_mod_main.h
new file mode 100644
index 0000000..986fbaa
--- /dev/null
+++ b/src/modules/conf_window_remembers/e_mod_main.h
@@ -0,0 +1,15 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_remembers.h"
+#undef E_TYPEDEFS
+#include "e_int_config_remembers.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_window_remembers/module.desktop b/src/modules/conf_window_remembers/module.desktop
new file mode 100644
index 0000000..c3e7692
--- /dev/null
+++ b/src/modules/conf_window_remembers/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window Remembers
+Icon=e-module-conf_window_remembers
+Comment=<hilight>E17 Configuration Applet</hilight><br><br>Delete existing window remembers.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop.in
new file mode 100644
index 0000000..c3e7692
--- /dev/null
+++ b/src/modules/conf_window_remembers/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window Remembers
+Icon=e-module-conf_window_remembers
+Comment=<hilight>E17 Configuration Applet</hilight><br><br>Delete existing window remembers.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_winlist/Makefile.in b/src/modules/conf_winlist/Makefile.in
index bfde630..b49a52b 100644
--- a/src/modules/conf_winlist/Makefile.in
+++ b/src/modules/conf_winlist/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c
index 4322699..d291915 100644
--- a/src/modules/conf_winlist/e_mod_main.c
+++ b/src/modules/conf_winlist/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
-   e_configure_registry_item_add("advanced/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
+   e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_winlist/module.desktop b/src/modules/conf_winlist/module.desktop
index 1363bd3..676b2b5 100644
--- a/src/modules/conf_winlist/module.desktop
+++ b/src/modules/conf_winlist/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window List
 Name[de]=
-Name[es]=Configuración - Lista de ventanas
+Name[eo]=Agordo - Fenestrolisto
+Name[es]=Configuración - Lista de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak lista
 Name[it]=Configurazione - Lista finestre
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_winlist
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure your window list properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de su lista de ventanas.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la ecojn de la fenestrolisto.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de su lista de ventanas.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà della lista delle finestre.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az ablak lista beállításait teszi lehetõvé ez a modul.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà della lista delle finestre.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
index 1363bd3..676b2b5 100644
--- a/src/modules/conf_winlist/module.desktop.in
+++ b/src/modules/conf_winlist/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Configuration - Window List
 Name[de]=
-Name[es]=Configuración - Lista de ventanas
+Name[eo]=Agordo - Fenestrolisto
+Name[es]=Configuración - Lista de ventanas
 Name[fr]=
+Name[hu]=Beállítások - Ablak lista
 Name[it]=Configurazione - Lista finestre
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-conf_winlist
 Comment=<hilight>E17 Configuration Applet</hilight><br><br>Configure your window list properties.
 Comment[de]=
-Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de su lista de ventanas.
+Comment[eo]=<hilight>Aplikaĵeto de E17 agordo<hilight><br><br>Agordi la ecojn de la fenestrolisto.
+Comment[es]=<hilight>Applet de configuración de E17</hilight><br><br>Configura las propiedades de su lista de ventanas.
 Comment[fr]=
-Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà della lista delle finestre.
+Comment[hu]=<hilight>E17 beállító alkalmazás</hilight><br><br>Az ablak lista beállításait teszi lehetõvé ez a modul.
+Comment[it]=<hilight>Applet configurazione di E17</hilight><br><br>Configura le proprietà della lista delle finestre.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index a4671b9..3aa7080 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -25,14 +25,14 @@ module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
 freqsetdir = $(pkgdir)
-freqset_DATA = \
-freqset$(EXEEXT)
 
 setuid_root_mode = a=rx,u+xs
+setuid_root_user = root
 install-data-hook:
+	@chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 	@chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 
-noinst_PROGRAMS        = freqset
+freqset_PROGRAMS       = freqset
 freqset_SOURCES        = freqset.c
 
 uninstall:
diff --git a/src/modules/cpufreq/Makefile.in b/src/modules/cpufreq/Makefile.in
index a2fbf59..248663e 100644
--- a/src/modules/cpufreq/Makefile.in
+++ b/src/modules/cpufreq/Makefile.in
@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = freqset$(EXEEXT)
+freqset_PROGRAMS = freqset$(EXEEXT)
 subdir = src/modules/cpufreq
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/module.desktop.in
@@ -60,13 +60,14 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" \
-	"$(DESTDIR)$(freqsetdir)"
+am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(freqsetdir)" \
+	"$(DESTDIR)$(filesdir)"
 pkgLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkg_LTLIBRARIES)
 am_module_la_OBJECTS = e_mod_main.lo
 module_la_OBJECTS = $(am_module_la_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
+freqsetPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(freqset_PROGRAMS)
 am_freqset_OBJECTS = freqset.$(OBJEXT)
 freqset_OBJECTS = $(am_freqset_OBJECTS)
 freqset_LDADD = $(LDADD)
@@ -84,8 +85,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 SOURCES = $(module_la_SOURCES) $(freqset_SOURCES)
 DIST_SOURCES = $(module_la_SOURCES) $(freqset_SOURCES)
 filesDATA_INSTALL = $(INSTALL_DATA)
-freqsetDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(files_DATA) $(freqset_DATA)
+DATA = $(files_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -112,6 +114,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -131,6 +134,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -156,6 +161,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -271,10 +277,8 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 freqsetdir = $(pkgdir)
-freqset_DATA = \
-freqset$(EXEEXT)
-
 setuid_root_mode = a=rx,u+xs
+setuid_root_user = root
 freqset_SOURCES = freqset.c
 all: all-am
 
@@ -340,9 +344,30 @@ clean-pkgLTLIBRARIES:
 	done
 module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkgdir) $(module_la_LDFLAGS) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
+install-freqsetPROGRAMS: $(freqset_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(freqsetdir)" || $(mkdir_p) "$(DESTDIR)$(freqsetdir)"
+	@list='$(freqset_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(freqsetPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(freqsetdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(freqsetPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(freqsetdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+uninstall-freqsetPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(freqset_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(freqsetdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(freqsetdir)/$$f"; \
+	done
+
+clean-freqsetPROGRAMS:
+	@list='$(freqset_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
@@ -407,23 +432,6 @@ uninstall-filesDATA:
 	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
 	done
-install-freqsetDATA: $(freqset_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(freqsetdir)" || $(mkdir_p) "$(DESTDIR)$(freqsetdir)"
-	@list='$(freqset_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(freqsetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(freqsetdir)/$$f'"; \
-	  $(freqsetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(freqsetdir)/$$f"; \
-	done
-
-uninstall-freqsetDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(freqset_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(freqsetdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(freqsetdir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -504,7 +512,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(freqsetdir)"; do \
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(freqsetdir)" "$(DESTDIR)$(filesdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -533,7 +541,7 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+clean-am: clean-freqsetPROGRAMS clean-generic clean-libtool \
 	clean-pkgLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
@@ -552,7 +560,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-filesDATA install-freqsetDATA \
+install-data-am: install-filesDATA install-freqsetPROGRAMS \
 	install-pkgLTLIBRARIES
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -583,25 +591,27 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-filesDATA uninstall-freqsetDATA \
+uninstall-am: uninstall-filesDATA uninstall-freqsetPROGRAMS \
 	uninstall-info-am uninstall-pkgLTLIBRARIES
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS clean-pkgLTLIBRARIES ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-hook install-exec install-exec-am \
-	install-filesDATA install-freqsetDATA install-info \
-	install-info-am install-man install-pkgLTLIBRARIES \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-filesDATA uninstall-freqsetDATA uninstall-info-am \
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-freqsetPROGRAMS clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-hook install-exec \
+	install-exec-am install-filesDATA install-freqsetPROGRAMS \
+	install-info install-info-am install-man \
+	install-pkgLTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-filesDATA \
+	uninstall-freqsetPROGRAMS uninstall-info-am \
 	uninstall-pkgLTLIBRARIES
 
 install-data-hook:
+	@chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 	@chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 
 uninstall:
diff --git a/src/modules/cpufreq/module.desktop b/src/modules/cpufreq/module.desktop
index cbe36c9..22b76d2 100644
--- a/src/modules/cpufreq/module.desktop
+++ b/src/modules/cpufreq/module.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Cpufreq
+Name[eo]=Ĉeforgana ofteco
+Name[hu]=Processzor frekvencia
 Icon=e-module-cpufreq
 Comment=<hilight>CPUfreq Gadget</hilight><br><br>Gadget to moitor and change the CPU frequency.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de ĉeforgana ofteco<hilight><br><br>Elrigardi kaj ŝanĝi ĉeforganan oftecon.
 Comment[es]=<hilight>Dispositivo de frecuencia de CPU</hilight><br><br>Dispositivo para monitorear y cambiar la frecuencia del CPU.
 Comment[fr]=
+Comment[hu]=<hilight>Processzor frekvencia modul</hilight><br><br>A processzor frekvenciáját felügyelő és beállító modul.
 Comment[it]=<hilight>Modulo CPUfreq</hilight><br><br>Modulo per il monitoraggio e la variazione della frequenza della CPU.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop.in
index cbe36c9..22b76d2 100644
--- a/src/modules/cpufreq/module.desktop.in
+++ b/src/modules/cpufreq/module.desktop.in
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Cpufreq
+Name[eo]=Ĉeforgana ofteco
+Name[hu]=Processzor frekvencia
 Icon=e-module-cpufreq
 Comment=<hilight>CPUfreq Gadget</hilight><br><br>Gadget to moitor and change the CPU frequency.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de ĉeforgana ofteco<hilight><br><br>Elrigardi kaj ŝanĝi ĉeforganan oftecon.
 Comment[es]=<hilight>Dispositivo de frecuencia de CPU</hilight><br><br>Dispositivo para monitorear y cambiar la frecuencia del CPU.
 Comment[fr]=
+Comment[hu]=<hilight>Processzor frekvencia modul</hilight><br><br>A processzor frekvenciáját felügyelő és beállító modul.
 Comment[it]=<hilight>Modulo CPUfreq</hilight><br><br>Modulo per il monitoraggio e la variazione della frequenza della CPU.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/dropshadow/Makefile.in b/src/modules/dropshadow/Makefile.in
index 6ddc807..a087e99 100644
--- a/src/modules/dropshadow/Makefile.in
+++ b/src/modules/dropshadow/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/dropshadow/module.desktop b/src/modules/dropshadow/module.desktop
index be788a5..325d7d6 100644
--- a/src/modules/dropshadow/module.desktop
+++ b/src/modules/dropshadow/module.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Dropshadow
+Name[eo]=Ä´etita ombro 
+Name[hu]=Árnyékvető
 Icon=e-module-dropshadow
 Comment=<hilight>Dropshadow Module</hilight><br><br>Module to add a dropshadow to windows.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de ĵetita ombro<hilight><br><br>Aldoni ĵetitan ombron al la fenestroj.
 Comment[es]=<hilight>Módulo de sombra</hilight><br><br>Módulo para añadir una sombra a las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>Árénykvető modul</hilight><br><br>A modul segítségével árnyékot vethetünk az ablakainkra.
 Comment[it]=<hilight>Modulo Dropshadow</hilight><br><br>Modulo per aggiungere un'ombreggiatura alle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/dropshadow/module.desktop.in b/src/modules/dropshadow/module.desktop.in
index be788a5..325d7d6 100644
--- a/src/modules/dropshadow/module.desktop.in
+++ b/src/modules/dropshadow/module.desktop.in
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Dropshadow
+Name[eo]=Ä´etita ombro 
+Name[hu]=Árnyékvető
 Icon=e-module-dropshadow
 Comment=<hilight>Dropshadow Module</hilight><br><br>Module to add a dropshadow to windows.
 Comment[de]=
+Comment[eo]=<hilight>Modulo de ĵetita ombro<hilight><br><br>Aldoni ĵetitan ombron al la fenestroj.
 Comment[es]=<hilight>Módulo de sombra</hilight><br><br>Módulo para añadir una sombra a las ventanas.
 Comment[fr]=
+Comment[hu]=<hilight>Árénykvető modul</hilight><br><br>A modul segítségével árnyékot vethetünk az ablakainkra.
 Comment[it]=<hilight>Modulo Dropshadow</hilight><br><br>Modulo per aggiungere un'ombreggiatura alle finestre.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/exebuf/Makefile.in b/src/modules/exebuf/Makefile.in
index 42c0132..de577f5 100644
--- a/src/modules/exebuf/Makefile.in
+++ b/src/modules/exebuf/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/exebuf/module.desktop b/src/modules/exebuf/module.desktop
index d2977a9..cf1e734 100644
--- a/src/modules/exebuf/module.desktop
+++ b/src/modules/exebuf/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=Run Command
 Name[de]=
+Name[eo]=Lanĉi komandojn
 Name[es]=Ejecutar comando
 Name[fr]=
+Name[hu]=Parancs futtatása
 Name[it]=Lanciacomandi
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-exebuf
 Comment=<hilight>Run Command Module</hilight><br><br>The run command module provides an application launcher dialog.
 Comment[de]=
-Comment[es]=<hilight>Módulo para ejecutar comandos</hilight><br><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
+Comment[eo]=<hilight>Modulo por lanĉi komandojn<hilight><br><br>La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj.
+Comment[es]=<hilight>Módulo para ejecutar comandos</hilight><br><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
 Comment[fr]=
-Comment[it]=<hilight>Modulo lanciacomandi</hilight><br><br>Questo modulo fornisce una voce di menù per l'esecuzione di comandi.
+Comment[hu]=<hilight>Parancs futtatása modul</hilight><br><br>A parancs futtató modul egy alkalmazásindítót biztosít a számunkra.
+Comment[it]=<hilight>Modulo lanciacomandi</hilight><br><br>Questo modulo fornisce una voce di menù per l'esecuzione di comandi.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/exebuf/module.desktop.in b/src/modules/exebuf/module.desktop.in
index d2977a9..cf1e734 100644
--- a/src/modules/exebuf/module.desktop.in
+++ b/src/modules/exebuf/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=Run Command
 Name[de]=
+Name[eo]=Lanĉi komandojn
 Name[es]=Ejecutar comando
 Name[fr]=
+Name[hu]=Parancs futtatása
 Name[it]=Lanciacomandi
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-exebuf
 Comment=<hilight>Run Command Module</hilight><br><br>The run command module provides an application launcher dialog.
 Comment[de]=
-Comment[es]=<hilight>Módulo para ejecutar comandos</hilight><br><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
+Comment[eo]=<hilight>Modulo por lanĉi komandojn<hilight><br><br>La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj.
+Comment[es]=<hilight>Módulo para ejecutar comandos</hilight><br><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
 Comment[fr]=
-Comment[it]=<hilight>Modulo lanciacomandi</hilight><br><br>Questo modulo fornisce una voce di menù per l'esecuzione di comandi.
+Comment[hu]=<hilight>Parancs futtatása modul</hilight><br><br>A parancs futtató modul egy alkalmazásindítót biztosít a számunkra.
+Comment[it]=<hilight>Modulo lanciacomandi</hilight><br><br>Questo modulo fornisce una voce di menù per l'esecuzione di comandi.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/fileman/Makefile.in b/src/modules/fileman/Makefile.in
index c28b8f8..c6fe89d 100644
--- a/src/modules/fileman/Makefile.in
+++ b/src/modules/fileman/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index ab58677..6bcaa90 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -87,7 +87,7 @@ static void _e_fwin_cb_exec_cmd_changed(void *data, void *data2);
 static void _e_fwin_cb_open(void *data, E_Dialog *dia);
 static void _e_fwin_cb_close(void *data, E_Dialog *dia);
 static void _e_fwin_cb_dialog_free(void *obj);
-static Evas_Bool _e_fwin_cb_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata);
+static Evas_Bool _e_fwin_cb_hash_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data __UNUSED__, void *fdata);
 static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici);
 static void _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext);
 static void _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always);
@@ -154,12 +154,12 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
    fwin->zone = zone;
    
    /* Add Event Handler for zone move/resize & del */
-   fwin->zone_handler = ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, 
-						_e_fwin_zone_move_resize, 
-						fwin);
-   fwin->zone_del_handler = ecore_event_handler_add(E_EVENT_ZONE_DEL, 
-						    _e_fwin_zone_del,
-						    fwin);
+   fwin->zone_handler = 
+     ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, 
+                             _e_fwin_zone_move_resize, fwin);
+   fwin->zone_del_handler = 
+     ecore_event_handler_add(E_EVENT_ZONE_DEL, 
+                             _e_fwin_zone_del, fwin);
    
    /* Trap the mouse_down on zone so we can unselect */
    evas_object_event_callback_add(zone->bg_event_object, 
@@ -295,7 +295,7 @@ e_fwin_reload_all(void)
 		  else 
 		    {
 		       char buf[256];
-		       
+
 		       if (fileman_config->view.show_desktop_icons) 
 			 {
 			    snprintf(buf, sizeof(buf), "%i", 
@@ -443,12 +443,6 @@ static void
 _e_fwin_free(E_Fwin *fwin)
 {
    if (!fwin) return; //safety
-   if (fwin->fad)
-     {
-	e_object_del(E_OBJECT(fwin->fad->dia));
-	fwin->fad = NULL;
-     }
-   if (fwin->win) e_object_del(E_OBJECT(fwin->win));
    if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
    if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
    if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
@@ -469,6 +463,12 @@ _e_fwin_free(E_Fwin *fwin)
    if (fwin->overlay_file) evas_stringshare_del(fwin->overlay_file);
    if (fwin->scrollframe_file) evas_stringshare_del(fwin->scrollframe_file);
    if (fwin->theme_file) evas_stringshare_del(fwin->theme_file);
+   if (fwin->fad)
+     {
+	e_object_del(E_OBJECT(fwin->fad->dia));
+	fwin->fad = NULL;
+     }
+   if (fwin->win) e_object_del(E_OBJECT(fwin->win));
    free(fwin);
 }
 
@@ -709,7 +709,7 @@ static void
 _e_fwin_cb_menu_open_with(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Fwin *fwin;
-   Evas_List *selected;
+   Evas_List *selected = NULL;
    
    fwin = data;
    selected = e_fm2_selected_list_get(fwin->fm_obj);
@@ -784,6 +784,9 @@ _e_fwin_cb_open(void *data, E_Dialog *dia)
      desktop = efreet_util_desktop_file_id_find(fad->app1);
    else if (fad->app2) 
      desktop = efreet_util_desktop_file_id_find(fad->app2);
+
+   if ((!desktop) && (!fad->exec_cmd)) return;
+
    if ((desktop) || (strcmp(fad->exec_cmd, "")))
      {
 	getcwd(pcwd, sizeof(pcwd));
@@ -831,21 +834,31 @@ _e_fwin_cb_open(void *data, E_Dialog *dia)
 		    }
 	       }
 	     evas_list_free(selected);
+	     
+	     // Create a fake .desktop for custom command.
+	     if (!desktop)
+	       {
+		  desktop = efreet_desktop_empty_new("");
+		  desktop->exec = strdup(fad->exec_cmd);
+	       }
+
 	     if (fad->fwin->win)
 	       {
 		  if (desktop)
-		    e_exec(fad->fwin->win->border->zone, desktop, NULL, files, "fwin");
-		  else
-		    e_exec(fad->fwin->win->border->zone, NULL, fad->exec_cmd, files, "fwin");
+                    e_exec(fad->fwin->win->border->zone, desktop, NULL, files,
+                           "fwin");
 	       }
 	     else if (fad->fwin->zone)
 	       {
 		  if (desktop)
-		    e_exec(fad->fwin->zone, desktop, NULL, files, "fwin");
-		  else
-		    e_exec(fad->fwin->zone, NULL, fad->exec_cmd, files, "fwin");
+                    e_exec(fad->fwin->zone, desktop, NULL, files, "fwin");
 	       }
-	     ecore_list_destroy(files);
+
+	     // Free fake .desktop
+	     if (!strcmp(fad->exec_cmd, ""))
+               efreet_desktop_free(desktop);
+
+	     ecore_list_destroy(files);	    
 	  }
 	chdir(pcwd);
      }
@@ -877,7 +890,7 @@ _e_fwin_cb_dialog_free(void *obj)
 }
 
 static Evas_Bool
-_e_fwin_cb_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_fwin_cb_hash_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data __UNUSED__, void *fdata)
 {
    Evas_List **mlist;
    
@@ -1072,7 +1085,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
 	       {
 		  if (S_ISDIR(ici->statinfo.st_mode))
 		    {
-		       if (!fileman_config->view.open_dirs_in_place || fwin->zone) 
+		       if ((!fileman_config->view.open_dirs_in_place) || (fwin->zone)) 
 			 {
 			    if (fwin->win)
 			      fwin2 = _e_fwin_new(fwin->win->container, NULL, ici->real_link);
diff --git a/src/modules/fileman/module.desktop b/src/modules/fileman/module.desktop
index 6aca756..ffa831f 100644
--- a/src/modules/fileman/module.desktop
+++ b/src/modules/fileman/module.desktop
@@ -2,8 +2,10 @@
 Type=Link
 Name=File Manager
 Name[de]=
+Name[eo]=Dosieradministrilo
 Name[es]=Administrador de archivos
 Name[fr]=
+Name[hu]=Fájlkezelõ
 Name[it]=File manager
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-fileman
 Comment=<hilight>The E17 File Manager</hilight><br><br>E17's integrated file manager.<br><hilight>Under Construction!</hilight>
 Comment[de]=
-Comment[es]=<hilight>El Administrador de archivos de E17</hilight><br><br>El administrador de archivos integrado a E17.<br><hilight>¡Todavía en construcción!</hilight>
+Comment[eo]=<hilight>La dosieradministrilo de E17<hilight><br><br>Integrita dosieradministrilo de E17.<br><hilight>Ĉiam en disvolviĝo</hilight>
+Comment[es]=<hilight>El Administrador de archivos de E17</hilight><br><br>El administrador de archivos integrado a E17.<br><hilight>¡Todavía en construcción!</hilight>
 Comment[fr]=
-Comment[it]=<hilight>Il file manager di E17</hilight><br><br>Questo è il file manager integrato in E17.
+Comment[hu]=<hilight>E17 fájlkezelõ modul</hilight><br><br>Az E17 beépített fájlkezelõje.<br><hilight>Fejlesztés alatt!</hilight>
+Comment[it]=<hilight>Il file manager di E17</hilight><br><br>Questo è il file manager integrato in E17.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop.in
index 6aca756..ffa831f 100644
--- a/src/modules/fileman/module.desktop.in
+++ b/src/modules/fileman/module.desktop.in
@@ -2,8 +2,10 @@
 Type=Link
 Name=File Manager
 Name[de]=
+Name[eo]=Dosieradministrilo
 Name[es]=Administrador de archivos
 Name[fr]=
+Name[hu]=Fájlkezelõ
 Name[it]=File manager
 Name[ja]=
 Name[pt]=
@@ -13,9 +15,11 @@ Name[zh_TW]=
 Icon=e-module-fileman
 Comment=<hilight>The E17 File Manager</hilight><br><br>E17's integrated file manager.<br><hilight>Under Construction!</hilight>
 Comment[de]=
-Comment[es]=<hilight>El Administrador de archivos de E17</hilight><br><br>El administrador de archivos integrado a E17.<br><hilight>¡Todavía en construcción!</hilight>
+Comment[eo]=<hilight>La dosieradministrilo de E17<hilight><br><br>Integrita dosieradministrilo de E17.<br><hilight>Ĉiam en disvolviĝo</hilight>
+Comment[es]=<hilight>El Administrador de archivos de E17</hilight><br><br>El administrador de archivos integrado a E17.<br><hilight>¡Todavía en construcción!</hilight>
 Comment[fr]=
-Comment[it]=<hilight>Il file manager di E17</hilight><br><br>Questo è il file manager integrato in E17.
+Comment[hu]=<hilight>E17 fájlkezelõ modul</hilight><br><br>Az E17 beépített fájlkezelõje.<br><hilight>Fejlesztés alatt!</hilight>
+Comment[it]=<hilight>Il file manager di E17</hilight><br><br>Questo è il file manager integrato in E17.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/ibar/Makefile.in b/src/modules/ibar/Makefile.in
index 91039aa..5f8ebca 100644
--- a/src/modules/ibar/Makefile.in
+++ b/src/modules/ibar/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/ibar/module.desktop b/src/modules/ibar/module.desktop
index 2ac9322..542ccc1 100644
--- a/src/modules/ibar/module.desktop
+++ b/src/modules/ibar/module.desktop
@@ -1,11 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=IBar
+Name[eo]=Breto IBar
 Icon=e-module-ibar
 Comment=<hilight>IconBar Gadget</hilight><br><br>Iconic application launcher.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de Piktograma breto<hilight><br><br>Lanĉilo de piktograma aplikaĵo.
 Comment[es]=<hilight>Dispositivo IconBar</hilight><br><br>Lanzador de aplicaciones con íconos.
 Comment[fr]=
+Comment[hu]=<hilight>IBar modul</hilight><br><br>Ikonokkal bővíthető alkalmazásindító modul.
 Comment[it]=<hilight>Modulo IBar</hilight><br><br>Una barra di icone per il lancio di applicazioni.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in
index 2ac9322..542ccc1 100644
--- a/src/modules/ibar/module.desktop.in
+++ b/src/modules/ibar/module.desktop.in
@@ -1,11 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=IBar
+Name[eo]=Breto IBar
 Icon=e-module-ibar
 Comment=<hilight>IconBar Gadget</hilight><br><br>Iconic application launcher.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de Piktograma breto<hilight><br><br>Lanĉilo de piktograma aplikaĵo.
 Comment[es]=<hilight>Dispositivo IconBar</hilight><br><br>Lanzador de aplicaciones con íconos.
 Comment[fr]=
+Comment[hu]=<hilight>IBar modul</hilight><br><br>Ikonokkal bővíthető alkalmazásindító modul.
 Comment[it]=<hilight>Modulo IBar</hilight><br><br>Una barra di icone per il lancio di applicazioni.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/ibox/Makefile.in b/src/modules/ibox/Makefile.in
index 65fde3b..0dd2169 100644
--- a/src/modules/ibox/Makefile.in
+++ b/src/modules/ibox/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index eb12bed..cf8685c 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -378,7 +378,11 @@ _ibox_fill(IBox *b)
 	  }
 	else if((b->inst->ci->show_zone == 1) && (bd->iconic))
 	  {
-	     if ((b->inst->ci->show_desk == 0) && (bd->zone == b->zone))
+ 	     if (bd->sticky)
+ 	       {
+ 		  ok = 1;
+ 	       }
+ 	     else if ((b->inst->ci->show_desk == 0) && (bd->zone == b->zone))
 	       {
 		  ok = 1;
 	       }
@@ -556,7 +560,7 @@ _ibox_icon_fill(IBox_Icon *ic)
 static void
 _ibox_icon_fill_label(IBox_Icon *ic)
 {
-   char *label = NULL;
+   const char *label = NULL;
 
    switch (ic->ibox->inst->ci->icon_label)
      {
@@ -1039,7 +1043,7 @@ _ibox_cb_event_border_add(void *data, int type, void *event)
 	  {
 	     b = l->data;
 	     if (_ibox_icon_find(b, ev->border)) continue;
-	     if ((b->inst->ci->show_desk) && (ev->border->desk != desk)) continue;
+	     if ((b->inst->ci->show_desk) && (ev->border->desk != desk) && (!ev->border->sticky)) continue;
 	     ic = _ibox_icon_new(b, ev->border);
 	     if (!ic) continue;
 	     b->icons = evas_list_append(b->icons, ic);
@@ -1101,7 +1105,7 @@ _ibox_cb_event_border_iconify(void *data, int type, void *event)
      {
 	b = l->data;
 	if (_ibox_icon_find(b, ev->border)) continue;
-	if ((b->inst->ci->show_desk) && (ev->border->desk != desk)) continue;
+	if ((b->inst->ci->show_desk) && (ev->border->desk != desk) && (!ev->border->sticky)) continue;
 	ic = _ibox_icon_new(b, ev->border);
 	if (!ic) continue;
 	b->icons = evas_list_append(b->icons, ic);
diff --git a/src/modules/ibox/module.desktop b/src/modules/ibox/module.desktop
index 4c422ba..96c705f 100644
--- a/src/modules/ibox/module.desktop
+++ b/src/modules/ibox/module.desktop
@@ -1,11 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=IBox
+Name[eo]=Breto IBox
 Icon=e-module-ibox
-Comment=<hilight>IconBox Gadget</hilight><br><br>An home for your iconified applications.
+Comment=<hilight>IconBox Gadget</hilight><br><br>A home for your iconified applications.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo IconBox<hilight><br><br>Ujo por siaj piktogramigitaj aplikaĵoj.
 Comment[es]=<hilight>Dispositivo IconBox</hilight><br><br>Un contenedor para sus aplicaciones iconificadas.
 Comment[fr]=
+Comment[hu]=<hilight>Ikondoboz modul</hilight><br><br>Ez a modul a minimalizált ablakoknak nyújt helyet :).
 Comment[it]=<hilight>Modulo IBox</hilight><br><br>Un contenitore per le applicazioni iconificate.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in
index 4c422ba..96c705f 100644
--- a/src/modules/ibox/module.desktop.in
+++ b/src/modules/ibox/module.desktop.in
@@ -1,11 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=IBox
+Name[eo]=Breto IBox
 Icon=e-module-ibox
-Comment=<hilight>IconBox Gadget</hilight><br><br>An home for your iconified applications.
+Comment=<hilight>IconBox Gadget</hilight><br><br>A home for your iconified applications.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo IconBox<hilight><br><br>Ujo por siaj piktogramigitaj aplikaĵoj.
 Comment[es]=<hilight>Dispositivo IconBox</hilight><br><br>Un contenedor para sus aplicaciones iconificadas.
 Comment[fr]=
+Comment[hu]=<hilight>Ikondoboz modul</hilight><br><br>Ez a modul a minimalizált ablakoknak nyújt helyet :).
 Comment[it]=<hilight>Modulo IBox</hilight><br><br>Un contenitore per le applicazioni iconificate.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/layout/Makefile.am b/src/modules/layout/Makefile.am
deleted file mode 100644
index 763c2d4..0000000
--- a/src/modules/layout/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = layout
-
-# 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_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
-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/layout/Makefile.in b/src/modules/layout/Makefile.in
deleted file mode 100644
index 084f752..0000000
--- a/src/modules/layout/Makefile.in
+++ /dev/null
@@ -1,562 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/layout
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/module.desktop.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = module.desktop
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"
-pkgLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(pkg_LTLIBRARIES)
-am_module_la_OBJECTS = e_mod_main.lo
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(module_la_SOURCES)
-DIST_SOURCES = $(module_la_SOURCES)
-filesDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(files_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
-ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
-EDJE_DEF = @EDJE_DEF@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-E_CFLAGS = @E_CFLAGS@
-E_DBUS_CFLAGS = @E_DBUS_CFLAGS@
-E_DBUS_LIBS = @E_DBUS_LIBS@
-E_HAL_CFLAGS = @E_HAL_CFLAGS@
-E_HAL_LIBS = @E_HAL_LIBS@
-E_LIBS = @E_LIBS@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
-HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
-HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
-HAVE_TEMPERATURE_TRUE = @HAVE_TEMPERATURE_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LOCALE_DIR = @LOCALE_DIR@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MODULE_ARCH = @MODULE_ARCH@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_LIB_DIR = @PACKAGE_LIB_DIR@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_SYSCONF_DIR = @PACKAGE_SYSCONF_DIR@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
-TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
-USE_NLS = @USE_NLS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-cf_cflags = @cf_cflags@
-cf_libs = @cf_libs@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-e_cflags = @e_cflags@
-e_libs = @e_libs@
-edje_cc = @edje_cc@
-exec_prefix = @exec_prefix@
-fnmatch_libs = @fnmatch_libs@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-x_cflags = @x_cflags@
-x_libs = @x_libs@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = layout
-
-# 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_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
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/layout/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/modules/layout/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-module.desktop: $(top_builddir)/config.status $(srcdir)/module.desktop.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-pkgLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$p"; \
-	done
-
-clean-pkgLTLIBRARIES:
-	-test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pkgdir) $(module_la_LDFLAGS) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-filesDATA: $(files_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(filesdir)" || $(mkdir_p) "$(DESTDIR)$(filesdir)"
-	@list='$(files_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(filesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filesdir)/$$f'"; \
-	  $(filesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filesdir)/$$f"; \
-	done
-
-uninstall-filesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(files_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-filesDATA install-pkgLTLIBRARIES
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-filesDATA uninstall-info-am \
-	uninstall-pkgLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkgLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-filesDATA install-info install-info-am \
-	install-man install-pkgLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-filesDATA \
-	uninstall-info-am uninstall-pkgLTLIBRARIES
-
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/modules/layout/e-module-layout.edj b/src/modules/layout/e-module-layout.edj
deleted file mode 100644
index a59e24c..0000000
Binary files a/src/modules/layout/e-module-layout.edj and /dev/null differ
diff --git a/src/modules/layout/e_mod_main.c b/src/modules/layout/e_mod_main.c
deleted file mode 100644
index b2c6ba1..0000000
--- a/src/modules/layout/e_mod_main.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-#include "e.h"
-#include "e_mod_main.h"
-
-/***************************************************************************/
-/**/
-/* actual module specifics */
-
-static E_Module *layout_module = NULL;
-static E_Border_Hook *hook = NULL;
-
-static void
-_e_module_layout_cb_hook(void *data, E_Border *bd)
-{
-   /* FIXME: make some modification based on policy */
-   printf("Window:\n"
-	  "  Title:    [%s][%s]\n"
-	  "  Class:    %s::%s\n"
-	  "  Geometry: %ix%i+%i+%i\n"
-	  "  New:      %i\n"
-	  , bd->client.icccm.title, bd->client.netwm.name
-	  , bd->client.icccm.name, bd->client.icccm.class
-	  , bd->x, bd->y, bd->w, bd->h
-	  , bd->new_client
-	  );
-   if ((bd->client.icccm.transient_for != 0) ||
-       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))
-     {
-	bd->client.e.state.centered = 1;
-     }
-   else
-     {
-	e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
-	e_border_move(bd,
-		      bd->zone->x + (bd->zone->w / 2),
-		      bd->zone->y + (bd->zone->h / 2));
-	e_border_resize(bd, 1, 1);
-	if (bd->bordername) evas_stringshare_del(bd->bordername);
-	bd->bordername = evas_stringshare_add("borderless");
-	bd->client.icccm.base_w = 1;
-	bd->client.icccm.base_h = 1;
-	bd->client.icccm.min_w = 1;
-	bd->client.icccm.min_h = 1;
-	bd->client.icccm.max_w = 32767;
-	bd->client.icccm.max_h = 32767;
-	bd->client.icccm.min_aspect = 0.0;
-	bd->client.icccm.max_aspect = 0.0;
-     }
-   e_border_maximize(bd, E_MAXIMIZE_FILL | E_MAXIMIZE_BOTH);
-}
-
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
-
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Layout"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   layout_module = m;
-
-   hook = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_FETCH,
-			    _e_module_layout_cb_hook, NULL);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m)
-{
-   if (hook)
-     {
-	e_border_hook_del(hook);
-	hook = NULL;
-     }
-   layout_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m)
-{
-   return 1;
-}
diff --git a/src/modules/layout/e_mod_main.h b/src/modules/layout/e_mod_main.h
deleted file mode 100644
index 2eb6036..0000000
--- a/src/modules/layout/e_mod_main.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-#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/layout/module.desktop b/src/modules/layout/module.desktop
deleted file mode 100644
index e489863..0000000
--- a/src/modules/layout/module.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Layout
-Icon=e-module-layout
-Comment=<hilight>Layout Module</hilight><br><br>Used to enforce layout policies. Generally not applicable for a desktop PC.
-Comment[de]=
-Comment[es]=<hilight>Módulo distribución</hilight><br><br>Usado para forzar las reglas de la distribución en la pantalla. Generalmente no útil para computadoras de escritorio.
-Comment[fr]=
-Comment[it]=<hilight>Modulo Layout</hilight><br><br>Usato per forzare delle regole di layout. In genere non applicabile ad un PC desktop.
-Comment[ja]=
-Comment[pt]=
-Comment[pt_BR]=
-Comment[zh_CN]=
-Comment[zh_TW]=
diff --git a/src/modules/layout/module.desktop.in b/src/modules/layout/module.desktop.in
deleted file mode 100644
index e489863..0000000
--- a/src/modules/layout/module.desktop.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Layout
-Icon=e-module-layout
-Comment=<hilight>Layout Module</hilight><br><br>Used to enforce layout policies. Generally not applicable for a desktop PC.
-Comment[de]=
-Comment[es]=<hilight>Módulo distribución</hilight><br><br>Usado para forzar las reglas de la distribución en la pantalla. Generalmente no útil para computadoras de escritorio.
-Comment[fr]=
-Comment[it]=<hilight>Modulo Layout</hilight><br><br>Usato per forzare delle regole di layout. In genere non applicabile ad un PC desktop.
-Comment[ja]=
-Comment[pt]=
-Comment[pt_BR]=
-Comment[zh_CN]=
-Comment[zh_TW]=
diff --git a/src/modules/msgbus_lang/Makefile.in b/src/modules/msgbus_lang/Makefile.in
index 72f4d8c..1d4954f 100644
--- a/src/modules/msgbus_lang/Makefile.in
+++ b/src/modules/msgbus_lang/Makefile.in
@@ -95,6 +95,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -107,6 +109,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -126,6 +129,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -151,6 +156,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/msgbus_lang/module.desktop b/src/modules/msgbus_lang/module.desktop
index 4505f2e..e419114 100644
--- a/src/modules/msgbus_lang/module.desktop
+++ b/src/modules/msgbus_lang/module.desktop
@@ -4,6 +4,7 @@ Name=DBus Extension - Language
 Name[de]=
 Name[es]=Extensión DBus - Idioma
 Name[fr]=
+Name[hu]=DBus kiterjesztés - Nyelv
 Name[it]=Estensione DBus - Lingua
 Name[ja]=
 Name[pt]=
@@ -13,7 +14,8 @@ Name[zh_TW]=
 Comment[de]=
 Comment[es]=
 Comment[fr]=
-Comment[it]=<hilight></hilight>
+Comment[hu]=<hilight>DBus kiterjesztés - Nyelv</hilight>
+Comment[it]=<hilight>Estensione DBus per la localizzazione</hilight>
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/msgbus_lang/module.desktop.in b/src/modules/msgbus_lang/module.desktop.in
index 4505f2e..e419114 100644
--- a/src/modules/msgbus_lang/module.desktop.in
+++ b/src/modules/msgbus_lang/module.desktop.in
@@ -4,6 +4,7 @@ Name=DBus Extension - Language
 Name[de]=
 Name[es]=Extensión DBus - Idioma
 Name[fr]=
+Name[hu]=DBus kiterjesztés - Nyelv
 Name[it]=Estensione DBus - Lingua
 Name[ja]=
 Name[pt]=
@@ -13,7 +14,8 @@ Name[zh_TW]=
 Comment[de]=
 Comment[es]=
 Comment[fr]=
-Comment[it]=<hilight></hilight>
+Comment[hu]=<hilight>DBus kiterjesztés - Nyelv</hilight>
+Comment[it]=<hilight>Estensione DBus per la localizzazione</hilight>
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/pager/Makefile.in b/src/modules/pager/Makefile.in
index c54176e..bb9dd32 100644
--- a/src/modules/pager/Makefile.in
+++ b/src/modules/pager/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/pager/module.desktop b/src/modules/pager/module.desktop
index 07199de..1195f50 100644
--- a/src/modules/pager/module.desktop
+++ b/src/modules/pager/module.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Pager
+Name[eo]=Tabulpaĝilo
+Name[hu]=Lapozó
 Icon=e-module-pager
 Comment=<hilight>Pager Gadget</hilight><br><br>Gadget to allow you to visualize your virtual desktops and the windows they contain.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de tabulpaĝilo<hilight><br><br>Vidigi siajn virtualajn labortablojn kaj ties fenestrojn.
 Comment[es]=<hilight>Dispositivo paginador</hilight><br><br>Dispositivo que permite visualizar los escritorios virtuales y las ventanas que contienen.
 Comment[fr]=
+Comment[hu]=<hilight>Lapozó modul</hilight><br><br>Ez a modul lehetővé teszi számunkra a látványos, virtuális munkaasztalok közötti váltást.
 Comment[it]=<hilight>Modulo Pager</hilight><br><br>Modulo che permette di visualizzare i desktop virtuali e le finestre che contengono.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in
index 07199de..1195f50 100644
--- a/src/modules/pager/module.desktop.in
+++ b/src/modules/pager/module.desktop.in
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Pager
+Name[eo]=Tabulpaĝilo
+Name[hu]=Lapozó
 Icon=e-module-pager
 Comment=<hilight>Pager Gadget</hilight><br><br>Gadget to allow you to visualize your virtual desktops and the windows they contain.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de tabulpaĝilo<hilight><br><br>Vidigi siajn virtualajn labortablojn kaj ties fenestrojn.
 Comment[es]=<hilight>Dispositivo paginador</hilight><br><br>Dispositivo que permite visualizar los escritorios virtuales y las ventanas que contienen.
 Comment[fr]=
+Comment[hu]=<hilight>Lapozó modul</hilight><br><br>Ez a modul lehetővé teszi számunkra a látványos, virtuális munkaasztalok közötti váltást.
 Comment[it]=<hilight>Modulo Pager</hilight><br><br>Modulo che permette di visualizzare i desktop virtuali e le finestre che contengono.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/start/Makefile.in b/src/modules/start/Makefile.in
index 56c635e..60b3bb5 100644
--- a/src/modules/start/Makefile.in
+++ b/src/modules/start/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index 4a37580..ecdb423 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -91,10 +91,17 @@ static void
 _gc_orient(E_Gadcon_Client *gcc)
 {
    Instance *inst;
+   Evas_Coord mw, mh;
    
    inst = gcc->data;
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_button, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_button, &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 char *
diff --git a/src/modules/start/module.desktop b/src/modules/start/module.desktop
index 869df18..0eb5425 100644
--- a/src/modules/start/module.desktop
+++ b/src/modules/start/module.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Start
+Name[eo]=Starto
+Name[hu]=Start menü
 Icon=e-module-start
 Comment=<hilight>Start Button Gadget</hilight><br><br>E17's "Start" button equivalent.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de starto-butono<hilight><br><br>Ekvivalenta "starto"-butono por E17.
 Comment[es]=<hilight>Dispositivo botón de inicio</hilight><br><br>El equivalente al botón "Inicio" en E17.
 Comment[fr]=
+Comment[hu]=<hilight>Start menü gomb mudul</hilight><br><br>E17 Start menü gombja.
 Comment[it]=<hilight>Modulo Start</hilight><br><br>L'equivalente del pulsante "Avvio" in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in
index 869df18..0eb5425 100644
--- a/src/modules/start/module.desktop.in
+++ b/src/modules/start/module.desktop.in
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Type=Link
 Name=Start
+Name[eo]=Starto
+Name[hu]=Start menü
 Icon=e-module-start
 Comment=<hilight>Start Button Gadget</hilight><br><br>E17's "Start" button equivalent.
 Comment[de]=
+Comment[eo]=<hilight>Akcesoraĵo de starto-butono<hilight><br><br>Ekvivalenta "starto"-butono por E17.
 Comment[es]=<hilight>Dispositivo botón de inicio</hilight><br><br>El equivalente al botón "Inicio" en E17.
 Comment[fr]=
+Comment[hu]=<hilight>Start menü gomb mudul</hilight><br><br>E17 Start menü gombja.
 Comment[it]=<hilight>Modulo Start</hilight><br><br>L'equivalente del pulsante "Avvio" in E17.
 Comment[ja]=
 Comment[pt]=
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index c9c7d27..4cb65fa 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -26,14 +26,8 @@ module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
 tempgetdir = $(pkgdir)
-tempget_DATA = \
-tempget$(EXEEXT)
 
-x_mode = a=rx,u+x
-install-data-hook:
-	@chmod $(x_mode) $(DESTDIR)$(tempgetdir)/tempget$(EXEEXT) || true
-
-noinst_PROGRAMS        = tempget
+tempget_PROGRAMS       = tempget
 tempget_SOURCES        = tempget.c
 tempget_LDFLAGS        = @TEMPERATURE_LIBS@
 
diff --git a/src/modules/temperature/Makefile.in b/src/modules/temperature/Makefile.in
index ce20119..0ead0eb 100644
--- a/src/modules/temperature/Makefile.in
+++ b/src/modules/temperature/Makefile.in
@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = tempget$(EXEEXT)
+tempget_PROGRAMS = tempget$(EXEEXT)
 subdir = src/modules/temperature
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/module.desktop.in
@@ -60,13 +60,14 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" \
-	"$(DESTDIR)$(tempgetdir)"
+am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(tempgetdir)" \
+	"$(DESTDIR)$(filesdir)"
 pkgLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkg_LTLIBRARIES)
 am_module_la_OBJECTS = e_mod_main.lo e_mod_config.lo
 module_la_OBJECTS = $(am_module_la_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
+tempgetPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(tempget_PROGRAMS)
 am_tempget_OBJECTS = tempget.$(OBJEXT)
 tempget_OBJECTS = $(am_tempget_OBJECTS)
 tempget_LDADD = $(LDADD)
@@ -84,8 +85,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 SOURCES = $(module_la_SOURCES) $(tempget_SOURCES)
 DIST_SOURCES = $(module_la_SOURCES) $(tempget_SOURCES)
 filesDATA_INSTALL = $(INSTALL_DATA)
-tempgetDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(files_DATA) $(tempget_DATA)
+DATA = $(files_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -112,6 +114,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -131,6 +134,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -156,6 +161,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
@@ -272,10 +278,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 tempgetdir = $(pkgdir)
-tempget_DATA = \
-tempget$(EXEEXT)
-
-x_mode = a=rx,u+x
 tempget_SOURCES = tempget.c
 tempget_LDFLAGS = @TEMPERATURE_LIBS@
 all: all-am
@@ -342,9 +344,30 @@ clean-pkgLTLIBRARIES:
 	done
 module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkgdir) $(module_la_LDFLAGS) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
+install-tempgetPROGRAMS: $(tempget_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(tempgetdir)" || $(mkdir_p) "$(DESTDIR)$(tempgetdir)"
+	@list='$(tempget_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tempgetPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(tempgetdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tempgetPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(tempgetdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+uninstall-tempgetPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(tempget_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(tempgetdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(tempgetdir)/$$f"; \
+	done
+
+clean-tempgetPROGRAMS:
+	@list='$(tempget_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
@@ -410,23 +433,6 @@ uninstall-filesDATA:
 	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
 	done
-install-tempgetDATA: $(tempget_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tempgetdir)" || $(mkdir_p) "$(DESTDIR)$(tempgetdir)"
-	@list='$(tempget_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(tempgetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tempgetdir)/$$f'"; \
-	  $(tempgetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tempgetdir)/$$f"; \
-	done
-
-uninstall-tempgetDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tempget_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(tempgetdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(tempgetdir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -507,7 +513,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(tempgetdir)"; do \
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(tempgetdir)" "$(DESTDIR)$(filesdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -536,8 +542,8 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	clean-pkgLTLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
+	clean-tempgetPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -556,9 +562,7 @@ info: info-am
 info-am:
 
 install-data-am: install-filesDATA install-pkgLTLIBRARIES \
-	install-tempgetDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+	install-tempgetPROGRAMS
 
 install-exec-am:
 
@@ -587,25 +591,23 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-filesDATA uninstall-info-am \
-	uninstall-pkgLTLIBRARIES uninstall-tempgetDATA
+	uninstall-pkgLTLIBRARIES uninstall-tempgetPROGRAMS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS clean-pkgLTLIBRARIES ctags \
+	clean-libtool clean-pkgLTLIBRARIES clean-tempgetPROGRAMS ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-hook install-exec install-exec-am \
-	install-filesDATA install-info install-info-am install-man \
-	install-pkgLTLIBRARIES install-strip install-tempgetDATA \
+	install-data-am install-exec install-exec-am install-filesDATA \
+	install-info install-info-am install-man \
+	install-pkgLTLIBRARIES install-strip install-tempgetPROGRAMS \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-filesDATA \
 	uninstall-info-am uninstall-pkgLTLIBRARIES \
-	uninstall-tempgetDATA
+	uninstall-tempgetPROGRAMS
 
-install-data-hook:
-	@chmod $(x_mode) $(DESTDIR)$(tempgetdir)/tempget$(EXEEXT) || true
 
 uninstall:
 	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index a9aeca6..545c744 100644
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -125,7 +125,43 @@ _fill_data(E_Config_Dialog_Data *cfdata)
       case SENSOR_TYPE_LINUX_INTELCORETEMP:
 	 break;
       case SENSOR_TYPE_LINUX_I2C:
-	 therms = temperature_get_i2c_files();
+	 therms = temperature_get_bus_files("i2c");
+	 if (therms)
+	   {
+              char *name;
+
+	      while ((name = ecore_list_next(therms)))
+	        {
+		   if (ecore_file_exists(name))
+		     {
+		        int len;
+
+			sprintf(path, "%s", ecore_file_file_get(name));
+			len = strlen(path);
+			if (len > 6)
+			   path[len - 6] = '\0';
+	                ecore_list_append(cfdata->sensors, strdup(path));
+			/* TODO: Track down the user friendly names and display them instead.
+			 * User friendly names are not available on the system, lm-sensors 
+			 * contains a database in /etc/sensors.conf, but the format may change,
+			 * so the best way to use that database is thru libsensors, but we 
+			 * don't want to add any more library dependencies. 
+			 */
+		     }
+		}
+	      ecore_list_destroy(therms);
+	   }
+
+	 ecore_list_first_goto(cfdata->sensors);
+	 while ((name = ecore_list_next(cfdata->sensors)))
+	   {
+	      if (!strcmp(cfdata->inst->sensor_name, name)) 
+		break;
+	      cfdata->sensor++;
+	   }
+	 break;
+      case SENSOR_TYPE_LINUX_PCI:
+	 therms = temperature_get_bus_files("pci");
 	 if (therms)
 	   {
               char *name;
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index f25cfcc..de8169e 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -43,8 +43,8 @@ static void _temperature_face_cb_post_menu(void *data, E_Menu *m);
 static void _temperature_face_level_set(Config_Face *inst, double level);
 static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
 
-static Evas_Bool _temperature_face_shutdown(Evas_Hash *hash, const char *key, void *hdata, void *fdata);
-static Evas_Bool _temperature_face_id_max(Evas_Hash *hash, const char *key, void *hdata, void *fdata);
+static Evas_Bool _temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *hdata, void *fdata __UNUSED__);
+static Evas_Bool _temperature_face_id_max(const Evas_Hash *hash __UNUSED__, const char *key, void *hdata __UNUSED__, void *fdata);
 
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_face_edd = NULL;
@@ -59,7 +59,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Object *o;
    E_Gadcon_Client *gcc;
    Config_Face *inst;
-   char buf[PATH_MAX];
 
    inst = evas_hash_find(temperature_config->faces, id);
    if (!inst)
@@ -91,16 +90,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    inst->o_temp = o;
    inst->module = temperature_config->module;
    inst->have_temp = -1;
-   snprintf(buf, sizeof(buf),
-	    "%s/%s/tempget %i \"%s\" %i", 
-	    e_module_dir_get(temperature_config->module), MODULE_ARCH, 
-	    inst->sensor_type,
-	    (inst->sensor_name != NULL ? inst->sensor_name : "-null-"),
-	    inst->poll_interval);
-   inst->tempget_exe = ecore_exe_pipe_run(buf, 
-					  ECORE_EXE_PIPE_READ | 
-					  ECORE_EXE_PIPE_READ_LINE_BUFFERED,
-					  inst);
+
    inst->tempget_data_handler = 
      ecore_event_handler_add(ECORE_EXE_EVENT_DATA,
 			     _temperature_cb_exe_data,
@@ -110,6 +100,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
 			     _temperature_cb_exe_del,
 			     inst);
    
+   temperature_face_update_config(inst);
+   
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
 				  _temperature_face_cb_mouse_down, inst);
    return gcc;
@@ -360,7 +352,7 @@ _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
 }
 
 static Evas_Bool
-_temperature_face_shutdown(Evas_Hash *hash, const char *key, void *hdata, void *fdata)
+_temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *hdata, void *fdata __UNUSED__)
 {
    Config_Face *inst;
 
@@ -373,11 +365,11 @@ _temperature_face_shutdown(Evas_Hash *hash, const char *key, void *hdata, void *
 }
 
 static Evas_Bool
-_temperature_face_id_max(Evas_Hash *hash, const char *key, void *hdata, void *fdata)
+_temperature_face_id_max(const Evas_Hash *hash __UNUSED__, const char *key, void *hdata __UNUSED__, void *fdata)
 {
    const char *p;
-   int        *max;
-   int         num = -1;
+   int *max;
+   int num = -1;
 
    max = fdata;
    p = strrchr(key, '.');
@@ -390,10 +382,13 @@ void
 temperature_face_update_config(Config_Face *inst)
 {
    char buf[PATH_MAX];
-   
-   ecore_exe_terminate(inst->tempget_exe);
-   ecore_exe_free(inst->tempget_exe);
-   inst->tempget_exe = NULL;
+
+   if (inst->tempget_exe)
+     {
+	ecore_exe_terminate(inst->tempget_exe);
+	ecore_exe_free(inst->tempget_exe);
+	inst->tempget_exe = NULL;
+     }
    snprintf(buf, sizeof(buf),
 	    "%s/%s/tempget %i \"%s\" %i", 
 	    e_module_dir_get(temperature_config->module), MODULE_ARCH, 
@@ -402,59 +397,63 @@ temperature_face_update_config(Config_Face *inst)
 	    inst->poll_interval);
    inst->tempget_exe = ecore_exe_pipe_run(buf, 
 					  ECORE_EXE_PIPE_READ | 
-					  ECORE_EXE_PIPE_READ_LINE_BUFFERED,
+					  ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+					  ECORE_EXE_NOT_LEADER,
 					  inst);
 }
 
 Ecore_List *
-temperature_get_i2c_files()
+temperature_get_bus_files(const char* bus)
 {
    Ecore_List *result;
    Ecore_List *therms;
    char        path[PATH_MAX];
-
+   char		busdir[PATH_MAX];
+   
    result = ecore_list_new();
    if (result)
      {
-        ecore_list_free_cb_set(result, free);
-
-        /* Look through all the i2c devices. */
-        therms = ecore_file_ls("/sys/bus/i2c/devices");
-        if (therms)
-          {
-             char *name;
-
+	ecore_list_free_cb_set(result, free);
+	snprintf(busdir, sizeof(busdir), "/sys/bus/%s/devices", bus);
+	/* Look through all the devices for the given bus. */
+	therms = ecore_file_ls(busdir);
+	if (therms)
+	  {
+	     char *name;
+	     
 	     while ((name = ecore_list_next(therms)))
 	       {
-                  Ecore_List *files;
-
-                  /* Search each device for temp*_input, these should be i2c temperature devices. */
-	          sprintf(path, "/sys/bus/i2c/devices/%s", name);
-	          files = ecore_file_ls(path);
-	          if (files)
-	            {
-                       char *file;
-
-	               while ((file = ecore_list_next(files)))
-	                 {
-		    	    if ((strncmp("temp", file, 4) == 0) && (strcmp("_input", &file[strlen(file) - 6]) == 0))
+		  Ecore_List *files;
+		  
+		  /* Search each device for temp*_input, these should be 
+		   * temperature devices. */
+		  snprintf(path, sizeof(path),
+			   "%s/%s", busdir, name);
+		  files = ecore_file_ls(path);
+		  if (files)
+		    {
+		       char *file;
+		       
+		       while ((file = ecore_list_next(files)))
+			 {
+			    if ((!strncmp("temp", file, 4)) && 
+				(!strcmp("_input", &file[strlen(file) - 6])))
 			      {
-			         char *f;
-
-	                         sprintf(path, "/sys/bus/i2c/devices/%s/%s", name, file);
-	                         f = strdup(path);
-			         if (f)
-	                            ecore_list_append(result, f);
+				 char *f;
+				 
+				 snprintf(path, sizeof(path),
+					  "%s/%s/%s", busdir, name, file);
+				 f = strdup(path);
+				 if (f) ecore_list_append(result, f);
 			      }
-	                 }
-	               ecore_list_destroy(files);
+			 }
+		       ecore_list_destroy(files);
 		    }
 	       }
 	     ecore_list_destroy(therms);
-          }
-        ecore_list_first_goto(result);
+	  }
+	ecore_list_first_goto(result);
      }
-
    return result;
 }
 
diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h
index 87c49e8..ced0517 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -21,6 +21,7 @@ typedef enum _Sensor_Type
    SENSOR_TYPE_LINUX_MACMINI,
    SENSOR_TYPE_LINUX_I2C,
    SENSOR_TYPE_LINUX_ACPI,
+   SENSOR_TYPE_LINUX_PCI,
    SENSOR_TYPE_LINUX_PBOOK,
    SENSOR_TYPE_LINUX_INTELCORETEMP
 } Sensor_Type;
@@ -69,7 +70,7 @@ EAPI int   e_modapi_save     (E_Module *m);
 
 void config_temperature_module(Config_Face *inst);
 void temperature_face_update_config(Config_Face *inst);
-Ecore_List *temperature_get_i2c_files(void);
+Ecore_List *temperature_get_bus_files(const char* bus);
 
 
 #endif
diff --git a/src/modules/temperature/module.desktop b/src/modules/temperature/module.desktop
index 9b3d20e..34d2f04 100644
--- a/src/modules/temperature/module.desktop
+++ b/src/modules/temperature/module.desktop
@@ -1,7 +1,11 @@
 [Desktop Entry]
 Type=Link
 Name=Temperature
+Name[eo]=Temperaturo
+Name[hu]=Hőmérséklet
 Icon=e-module-temperature
 Comment=<hilight>Temperature Gadget</hilight><br><br>Temperature monitor.
+Comment[eo]=<hilight>Akcesoraĵo de temperaturo</hilight><br><br>Elrigardi temperaturon.
+Comment[hu]=<hilight>Hőmérséklet modul</hilight><br><br>Egy hőmérséklet monitorozó modul.
 Comment[it]=<hilight>Modulo Temperature</hilight><br><br>Monitor per le temperature.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in
index 9b3d20e..34d2f04 100644
--- a/src/modules/temperature/module.desktop.in
+++ b/src/modules/temperature/module.desktop.in
@@ -1,7 +1,11 @@
 [Desktop Entry]
 Type=Link
 Name=Temperature
+Name[eo]=Temperaturo
+Name[hu]=Hőmérséklet
 Icon=e-module-temperature
 Comment=<hilight>Temperature Gadget</hilight><br><br>Temperature monitor.
+Comment[eo]=<hilight>Akcesoraĵo de temperaturo</hilight><br><br>Elrigardi temperaturon.
+Comment[hu]=<hilight>Hőmérséklet modul</hilight><br><br>Egy hőmérséklet monitorozó modul.
 Comment[it]=<hilight>Modulo Temperature</hilight><br><br>Monitor per le temperature.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/temperature/tempget.c b/src/modules/temperature/tempget.c
index cccdcc3..1fe62a5 100644
--- a/src/modules/temperature/tempget.c
+++ b/src/modules/temperature/tempget.c
@@ -26,18 +26,20 @@ static int check(void);
 static int poll_cb(void *data);
 
 Ecore_List *
-temperature_get_i2c_files()
+temperature_get_bus_files(const char* bus)
 {
    Ecore_List *result;
    Ecore_List *therms;
    char        path[PATH_MAX];
+   char		busdir[PATH_MAX];
    
    result = ecore_list_new();
    if (result)
      {
 	ecore_list_free_cb_set(result, free);
-	/* Look through all the i2c devices. */
-	therms = ecore_file_ls("/sys/bus/i2c/devices");
+	snprintf(busdir, sizeof(busdir), "/sys/bus/%s/devices", bus);
+	/* Look through all the devices for the given bus. */
+	therms = ecore_file_ls(busdir);
 	if (therms)
 	  {
 	     char *name;
@@ -47,9 +49,9 @@ temperature_get_i2c_files()
 		  Ecore_List *files;
 		  
 		  /* Search each device for temp*_input, these should be 
-		   * i2c temperature devices. */
+		   * temperature devices. */
 		  snprintf(path, sizeof(path),
-			   "/sys/bus/i2c/devices/%s", name);
+			   "%s/%s", busdir, name);
 		  files = ecore_file_ls(path);
 		  if (files)
 		    {
@@ -63,8 +65,7 @@ temperature_get_i2c_files()
 				 char *f;
 				 
 				 snprintf(path, sizeof(path),
-					  "/sys/bus/i2c/devices/%s/%s", 
-					  name, file);
+					  "%s/%s/%s", busdir, name, file);
 				 f = strdup(path);
 				 if (f) ecore_list_append(result, f);
 			      }
@@ -133,7 +134,8 @@ init(void)
 	       }
 	     else
 	       {
-		  therms = temperature_get_i2c_files();
+		  // try the i2c bus
+		  therms = temperature_get_bus_files("i2c");
 		  if (therms)
 		    {
 		       char *name;
@@ -151,10 +153,44 @@ init(void)
 				 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);
 			      }
 			 }
 		       ecore_list_destroy(therms);
 		    }
+		  if (!sensor_path)
+		    {
+		       // try the pci bus
+		       therms = temperature_get_bus_files("pci");
+		       if (therms)
+			 {
+			    char *name;
+
+			    if ((name = ecore_list_next(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);
+				   }
+			      }
+			    ecore_list_destroy(therms);
+			 }
+		    }
 	       }
 	  }
 #endif
@@ -208,6 +244,28 @@ init(void)
 		  ecore_list_destroy(therms);
 	       }
 	     break;
+	   case SENSOR_TYPE_LINUX_PCI:
+	     therms = ecore_file_ls("/sys/bus/pci/devices");
+	     if (therms)
+	       {
+		  char *name;
+		  
+		  while ((name = ecore_list_next(therms)))
+		    {
+		       snprintf(path, sizeof(path),
+				"/sys/bus/pci/devices/%s/%s_input",
+				name, sensor_name);
+		       if (ecore_file_exists(path))
+			 {
+			    sensor_path = strdup(path);
+			    /* We really only care about the first
+			     * one for the default. */
+			    break;
+			 }
+		    }
+		  ecore_list_destroy(therms);
+	       }
+	     break;
 	   case SENSOR_TYPE_LINUX_ACPI:
 	     snprintf(path, sizeof(path),
 		      "/proc/acpi/thermal_zone/%s/temperature",
@@ -301,6 +359,25 @@ check(void)
 	else
 	  goto error;
 	break;
+      case SENSOR_TYPE_LINUX_PCI:
+	f = fopen(sensor_path, "r");
+	if (f)
+	  {
+	     fgets(buf, sizeof(buf), f);
+	     buf[sizeof(buf) - 1] = 0;
+	     
+	     /* actually read the temp */
+	     if (sscanf(buf, "%i", &temp) == 1)
+	       ret = 1;
+	     else
+	       goto error;
+	     /* Hack for temp */
+	     temp = temp / 1000;
+	     fclose(f);
+	  }
+	else
+	  goto error;
+	break;
       case SENSOR_TYPE_LINUX_ACPI:
 	f = fopen(sensor_path, "r");
 	if (f)
diff --git a/src/modules/winlist/Makefile.in b/src/modules/winlist/Makefile.in
index f409154..fb0e05b 100644
--- a/src/modules/winlist/Makefile.in
+++ b/src/modules/winlist/Makefile.in
@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +106,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -123,6 +126,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -148,6 +153,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/winlist/module.desktop b/src/modules/winlist/module.desktop
index 39866b6..d508ed6 100644
--- a/src/modules/winlist/module.desktop
+++ b/src/modules/winlist/module.desktop
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=Window Switcher List
+Name[eo]=Interŝanĝilo de fenestroj
+Name[hu]=Ablak lista/váltó
 Name[it]=Commutatore finestre
 Icon=e-module-winlist
 Comment=<hilight>Window List Module</hilight><br><br>A module to show the list of client applications presently running.
+Comment[eo]=<hilight>Modulo de interŝanĝo de fenestroj<hilight><br><br>Vidigi liston de klientaj aplikaĵoj nune funkciantaj.
+Comment[hu]=<hilight>Ablak lista/váltó modul</hilight><br><br>A modul megmutatja az éppen futó alkalmazások ablakainak listáját.
 Comment[it]=<hilight>Modulo commutazione finestre</hilight><br><br>Un modulo per la visualizzazione e la navigazione tra le finestre aperte.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/winlist/module.desktop.in b/src/modules/winlist/module.desktop.in
index 39866b6..d508ed6 100644
--- a/src/modules/winlist/module.desktop.in
+++ b/src/modules/winlist/module.desktop.in
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=Window Switcher List
+Name[eo]=Interŝanĝilo de fenestroj
+Name[hu]=Ablak lista/váltó
 Name[it]=Commutatore finestre
 Icon=e-module-winlist
 Comment=<hilight>Window List Module</hilight><br><br>A module to show the list of client applications presently running.
+Comment[eo]=<hilight>Modulo de interŝanĝo de fenestroj<hilight><br><br>Vidigi liston de klientaj aplikaĵoj nune funkciantaj.
+Comment[hu]=<hilight>Ablak lista/váltó modul</hilight><br><br>A modul megmutatja az éppen futó alkalmazások ablakainak listáját.
 Comment[it]=<hilight>Modulo commutazione finestre</hilight><br><br>Un modulo per la visualizzazione e la navigazione tra le finestre aperte.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/wizard/Makefile.in b/src/modules/wizard/Makefile.in
index da54efc..68b63c7 100644
--- a/src/modules/wizard/Makefile.in
+++ b/src/modules/wizard/Makefile.in
@@ -100,6 +100,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -112,6 +114,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -131,6 +134,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -156,6 +161,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@
diff --git a/src/modules/wizard/module.desktop b/src/modules/wizard/module.desktop
index d914b0c..fdbced0 100644
--- a/src/modules/wizard/module.desktop
+++ b/src/modules/wizard/module.desktop
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=First Run Wizard
+Name[eo]=Asistanto de unua lanĉo
+Name[hu]=Első indítás varázsló
 Name[it]=Wizard prima esecuzione
 Icon=e-module-wizard
 Comment=<hilight>First Run Wizard</hilight><br><br>The first run wizard will help configure E, when E is started for the first time.<br><hilight>WARNING!!! DO NOT USE!!!</hilight>
+Comment[eo]=<hilight>Asistanto de unua lanĉo<hilight><br><br>La asistanto de unua lanĉo helpos vi agordi E17, kiam E17 startiĝos je la unua fojo.<br><hilight>ATENTU!!! NE UZI!!!</hilight>
+Comment[hu]=<hilight>Első indítás varázsló</hilight><br><br>Ez a varázsló segítséget nyújt a számodra az E beállításához.<br><hilight>FIGYELEM!!! NE HASZNÁLD!!!</hilight>
 Comment[it]=<hilight>Wizard prima esecuzione</hilight><br><br>Wizard che aiuta a configurare E17 la prima volta che questo viene avviato.<br><hilight>ATTENZIONE!!! NON USARE!!!</hilight>
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/wizard/module.desktop.in b/src/modules/wizard/module.desktop.in
index d914b0c..fdbced0 100644
--- a/src/modules/wizard/module.desktop.in
+++ b/src/modules/wizard/module.desktop.in
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=First Run Wizard
+Name[eo]=Asistanto de unua lanĉo
+Name[hu]=Első indítás varázsló
 Name[it]=Wizard prima esecuzione
 Icon=e-module-wizard
 Comment=<hilight>First Run Wizard</hilight><br><br>The first run wizard will help configure E, when E is started for the first time.<br><hilight>WARNING!!! DO NOT USE!!!</hilight>
+Comment[eo]=<hilight>Asistanto de unua lanĉo<hilight><br><br>La asistanto de unua lanĉo helpos vi agordi E17, kiam E17 startiĝos je la unua fojo.<br><hilight>ATENTU!!! NE UZI!!!</hilight>
+Comment[hu]=<hilight>Első indítás varázsló</hilight><br><br>Ez a varázsló segítséget nyújt a számodra az E beállításához.<br><hilight>FIGYELEM!!! NE HASZNÁLD!!!</hilight>
 Comment[it]=<hilight>Wizard prima esecuzione</hilight><br><br>Wizard che aiuta a configurare E17 la prima volta che questo viene avviato.<br><hilight>ATTENZIONE!!! NON USARE!!!</hilight>
 X-Enlightenment-ModuleType=config
diff --git a/src/preload/Makefile.in b/src/preload/Makefile.in
index 6ed5784..a98dc78 100644
--- a/src/preload/Makefile.in
+++ b/src/preload/Makefile.in
@@ -88,6 +88,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -100,6 +102,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -119,6 +122,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+HAVE_BATTERY_FALSE = @HAVE_BATTERY_FALSE@
+HAVE_BATTERY_TRUE = @HAVE_BATTERY_TRUE@
 HAVE_EDBUS_FALSE = @HAVE_EDBUS_FALSE@
 HAVE_EDBUS_TRUE = @HAVE_EDBUS_TRUE@
 HAVE_TEMPERATURE_FALSE = @HAVE_TEMPERATURE_FALSE@
@@ -144,6 +149,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MODULE_ARCH = @MODULE_ARCH@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BIN_DIR = @PACKAGE_BIN_DIR@

-- 
Enlightenment 17



More information about the Pkg-e-commits mailing list